diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/XAxis.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/XAxis.jsx
deleted file mode 100644
index ca2739d405..0000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/XAxis.jsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { AxisBottom, AxisTop } from '@vx/axis';
-import { axisStylesShape, tickStylesShape } from '@data-ui/xy-chart/esm/utils/propShapes';
-
-const propTypes = {
-  axisStyles: axisStylesShape,
-  hideZero: PropTypes.bool,
-  // probably injected by parent
-  innerHeight: PropTypes.number,
-  label: PropTypes.string,
-  labelOffset: PropTypes.number,
-  labelProps: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
-  numTicks: PropTypes.number,
-  orientation: PropTypes.oneOf(['bottom', 'top']),
-  rangePadding: PropTypes.number,
-  scale: PropTypes.func,
-  tickComponent: PropTypes.func,
-  tickFormat: PropTypes.func,
-  tickLabelProps: PropTypes.func,
-  tickStyles: tickStylesShape,
-  tickValues: PropTypes.arrayOf(
-    // number or date/moment object
-    PropTypes.oneOfType([PropTypes.number, PropTypes.object, PropTypes.string]),
-  ),
-};
-
-const defaultProps = {
-  axisStyles: {},
-  hideZero: false,
-  innerHeight: null,
-  label: null,
-  labelOffset: 14,
-  labelProps: null,
-  numTicks: null,
-  orientation: 'bottom',
-  rangePadding: null,
-  scale: null,
-  tickComponent: null,
-  tickFormat: null,
-  tickLabelProps: null,
-  tickStyles: {},
-  tickValues: undefined,
-};
-
-export default class XAxis extends React.PureComponent {
-  render() {
-    const {
-      axisStyles,
-      innerHeight,
-      hideZero,
-      label,
-      labelOffset,
-      labelProps,
-      numTicks,
-      orientation,
-      rangePadding,
-      scale,
-      tickComponent,
-      tickFormat,
-      tickLabelProps: passedTickLabelProps,
-      tickStyles,
-      tickValues,
-    } = this.props;
-    if (!scale || !innerHeight) return null;
-    const Axis = orientation === 'bottom' ? AxisBottom : AxisTop;
-
-    let tickLabelProps = passedTickLabelProps;
-    if (!tickLabelProps) {
-      tickLabelProps =
-        tickStyles.label && tickStyles.label[orientation]
-          ? () => tickStyles.label[orientation]
-          : undefined;
-    }
-
-    return (
-      <Axis
-        top={orientation === 'bottom' ? innerHeight : 0}
-        left={0}
-        rangePadding={rangePadding}
-        hideTicks={numTicks === 0}
-        hideZero={hideZero}
-        label={label}
-        labelOffset={labelOffset}
-        labelProps={labelProps || (axisStyles.label || {})[orientation]}
-        numTicks={numTicks}
-        scale={scale}
-        stroke={axisStyles.stroke}
-        strokeWidth={axisStyles.strokeWidth}
-        tickComponent={tickComponent}
-        tickFormat={tickFormat}
-        tickLabelProps={tickLabelProps}
-        tickLength={tickStyles.tickLength}
-        tickStroke={tickStyles.stroke}
-        tickValues={tickValues}
-      />
-    );
-  }
-}
-
-XAxis.propTypes = propTypes;
-XAxis.defaultProps = defaultProps;
-XAxis.displayName = 'XAxis';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook-config/webpack.config.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook-config/webpack.config.js
index a8c73336e3..56b9f594f9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook-config/webpack.config.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook-config/webpack.config.js
@@ -10,7 +10,7 @@ module.exports = (storybookBaseConfig, configType, defaultConfig) => {
 
   defaultConfig.module.rules.push({
     exclude: /node_modules/,
-    include: new RegExp(`${path.resolve(__dirname, '../../superset-ui-legacy-')}.+/src`),
+    include: new RegExp(`${path.resolve(__dirname, '../../superset-ui-(plugin|preset)-')}.+/src`),
     test: /\.jsx?$/,
     use: defaultConfig.module.rules[0].use,
   });
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/Stories.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/Stories.jsx
similarity index 91%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/Stories.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/Stories.jsx
index e1ee373c7e..23b4159e2f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/Stories.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/Stories.jsx
@@ -24,6 +24,6 @@ export default [
       />
     ),
     storyName: 'Basic',
-    storyPath: 'plugin-chart-box-plot|BoxPlotChartPlugin',
+    storyPath: 'preset-chart-xy|BoxPlotChartPlugin',
   },
 ];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/data.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/data.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/data.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/data.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/index.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.js
similarity index 62%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/index.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.js
index ee61de83d8..d4654bfea7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/legacy-plugin-chart-box-plot/index.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.js
@@ -1,4 +1,4 @@
-import BoxPlotChartPlugin from '../../../../superset-ui-legacy-plugin-chart-box-plot/src';
+import { BoxPlotChartPlugin } from '../../../../../superset-ui-preset-chart-xy/src';
 import Stories from './Stories';
 
 new BoxPlotChartPlugin().configure({ key: 'box-plot2' }).register();
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md
similarity index 55%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/README.md
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md
index 850da65f70..5539fed863 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/README.md
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/README.md
@@ -1,7 +1,7 @@
-## @superset-ui/legacy-plugin-chart-box-plot
+## @superset-ui/preset-chart-xy
 
-[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-box-plot.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-box-plot.svg?style=flat-square)
-[![David (path)](https://img.shields.io/david/apache-superset/superset-ui-plugins.svg?path=packages%2Fsuperset-ui-legacy-plugin-chart-box-plot&style=flat-square)](https://david-dm.org/apache-superset/superset-ui-plugins?path=packages/superset-ui-legacy-plugin-chart-box-plot)
+[![Version](https://img.shields.io/npm/v/@superset-ui/preset-chart-xy.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/preset-chart-xy.svg?style=flat-square)
+[![David (path)](https://img.shields.io/david/apache-superset/superset-ui-plugins.svg?path=packages%2Fsuperset-ui-preset-chart-xy&style=flat-square)](https://david-dm.org/apache-superset/superset-ui-plugins?path=packages/superset-ui-preset-chart-xy)
 
 This plugin provides Box Plot for Superset.
 
@@ -10,7 +10,7 @@ This plugin provides Box Plot for Superset.
 Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to lookup this chart throughout the app.
 
 ```js
-import BoxPlotChartPlugin from '@superset-ui/legacy-plugin-chart-box-plot';
+import { BoxPlotChartPlugin } from '@superset-ui/preset-chart-xy';
 
 new BoxPlotChartPlugin()
   .configure({ key: 'box-plot' })
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json
similarity index 91%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/package.json
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json
index d8049cb894..0f2d66c4c1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@superset-ui/legacy-plugin-chart-box-plot",
+  "name": "@superset-ui/preset-chart-xy",
   "version": "0.0.0",
-  "description": "Superset Legacy Chart - Box Plot",
+  "description": "Superset Chart - XY",
   "sideEffects": false,
   "main": "lib/index.js",
   "module": "esm/index.js",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/BoxPlot.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.jsx
similarity index 95%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/BoxPlot.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.jsx
index 90aee40b97..4e147b7da6 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/BoxPlot.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/BoxPlot.jsx
@@ -23,10 +23,10 @@ import { BoxPlotSeries, XYChart } from '@data-ui/xy-chart';
 import { themeShape } from '@data-ui/xy-chart/esm/utils/propShapes';
 import { chartTheme } from '@data-ui/theme';
 import { CategoricalColorNamespace } from '@superset-ui/color';
-import createTooltip from './utils/createBoxPlotTooltip';
-import renderLegend from './utils/renderLegend';
-import XYChartLayout from './utils/XYChartLayout';
-import WithLegend from './WithLegend';
+import createTooltip from './createBoxPlotTooltip';
+import renderLegend from '../utils/renderLegend';
+import XYChartLayout from '../utils/XYChartLayout';
+import WithLegend from '../components/WithLegend';
 
 chartTheme.gridStyles.stroke = '#f1f3f5';
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/createBoxPlotTooltip.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/createBoxPlotTooltip.jsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/createBoxPlotTooltip.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/createBoxPlotTooltip.jsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/images/thumbnail.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnail.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/images/thumbnail.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnail.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/images/thumbnailLarge.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/images/thumbnailLarge.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnailLarge.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/index.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.js
similarity index 95%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/index.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.js
index 69eb45fd19..af031ad68f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/index.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/index.js
@@ -28,7 +28,7 @@ const metadata = new ChartMetadata({
   useLegacyApi: true,
 });
 
-export default class HistogramChartPlugin extends ChartPlugin {
+export default class BoxPlotChartPlugin extends ChartPlugin {
   constructor() {
     super({
       loadChart: () => import('./BoxPlot'),
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/transformProps.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/ChartFrame.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/components/ChartFrame.jsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/ChartFrame.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/components/ChartFrame.jsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/WithLegend.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/components/WithLegend.jsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/WithLegend.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/components/WithLegend.jsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/index.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/index.js
new file mode 100644
index 0000000000..d795b8729f
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/index.js
@@ -0,0 +1,3 @@
+/* eslint-disable import/prefer-default-export */
+
+export { default as BoxPlotChartPlugin } from './BoxPlot';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/XYChartLayout.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/XYChartLayout.jsx
similarity index 97%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/XYChartLayout.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/XYChartLayout.jsx
index 3b51cdc46c..1099ebffa0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/XYChartLayout.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/XYChartLayout.jsx
@@ -2,14 +2,13 @@
 
 import React from 'react';
 import collectScalesFromProps from '@data-ui/xy-chart/esm/utils/collectScalesFromProps';
-import { YAxis } from '@data-ui/xy-chart';
+import { XAxis, YAxis } from '@data-ui/xy-chart';
 import adjustMargin from './adjustMargin';
 import computeXAxisLayout from './computeXAxisLayout';
 import computeYAxisLayout from './computeYAxisLayout';
 import createTickComponent from './createTickComponent';
 import getTickLabels from './getTickLabels';
-import XAxis from '../XAxis';
-import ChartFrame from '../ChartFrame';
+import ChartFrame from '../components/ChartFrame';
 
 // Additional margin to avoid content hidden behind scroll bar
 const OVERFLOW_MARGIN = 8;
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/adjustMargin.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/adjustMargin.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/adjustMargin.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/adjustMargin.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeChartLayout.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeChartLayout.jsx
similarity index 98%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeChartLayout.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeChartLayout.jsx
index 81e51df5e9..ca55e5e660 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeChartLayout.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeChartLayout.jsx
@@ -2,13 +2,12 @@
 
 import React from 'react';
 import collectScalesFromProps from '@data-ui/xy-chart/esm/utils/collectScalesFromProps';
-import { YAxis } from '@data-ui/xy-chart';
+import { XAxis, YAxis } from '@data-ui/xy-chart';
 import adjustMargin from './adjustMargin';
 import computeXAxisLayout from './computeXAxisLayout';
 import computeYAxisLayout from './computeYAxisLayout';
 import createTickComponent from './createTickComponent';
 import getTickLabels from './getTickLabels';
-import XAxis from '../XAxis';
 
 const OVERFLOW_MARGIN = 8;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeXAxisLayout.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeXAxisLayout.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeXAxisLayout.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeXAxisLayout.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeYAxisLayout.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeYAxisLayout.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/computeYAxisLayout.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/computeYAxisLayout.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/createTickComponent.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/createTickComponent.jsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/createTickComponent.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/createTickComponent.jsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/getTickLabels.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/getTickLabels.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/getTickLabels.js
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/getTickLabels.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/renderLegend.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/renderLegend.jsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-box-plot/src/utils/renderLegend.jsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/renderLegend.jsx