diff --git a/packages/block-editor/src/components/child-layout-control/index.js b/packages/block-editor/src/components/child-layout-control/index.js
index b27d6cacd06975..c0d90b24b29312 100644
--- a/packages/block-editor/src/components/child-layout-control/index.js
+++ b/packages/block-editor/src/components/child-layout-control/index.js
@@ -19,7 +19,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { useGetNumberOfBlocksBeforeCell } from '../grid-visualizer/use-get-number-of-blocks-before-cell';
+import { useGetNumberOfBlocksBeforeCell } from '../grid/use-get-number-of-blocks-before-cell';
 import { store as blockEditorStore } from '../../store';
 
 function helpText( selfStretch, parentLayout ) {
diff --git a/packages/block-editor/src/components/grid-visualizer/grid-item-movers.js b/packages/block-editor/src/components/grid/grid-item-movers.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/grid-item-movers.js
rename to packages/block-editor/src/components/grid/grid-item-movers.js
diff --git a/packages/block-editor/src/components/grid-visualizer/grid-item-resizer.js b/packages/block-editor/src/components/grid/grid-item-resizer.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/grid-item-resizer.js
rename to packages/block-editor/src/components/grid/grid-item-resizer.js
diff --git a/packages/block-editor/src/components/grid-visualizer/grid-visualizer.js b/packages/block-editor/src/components/grid/grid-visualizer.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/grid-visualizer.js
rename to packages/block-editor/src/components/grid/grid-visualizer.js
diff --git a/packages/block-editor/src/components/grid-visualizer/index.js b/packages/block-editor/src/components/grid/index.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/index.js
rename to packages/block-editor/src/components/grid/index.js
diff --git a/packages/block-editor/src/components/grid-visualizer/style.scss b/packages/block-editor/src/components/grid/style.scss
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/style.scss
rename to packages/block-editor/src/components/grid/style.scss
diff --git a/packages/block-editor/src/components/grid-visualizer/use-get-number-of-blocks-before-cell.js b/packages/block-editor/src/components/grid/use-get-number-of-blocks-before-cell.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/use-get-number-of-blocks-before-cell.js
rename to packages/block-editor/src/components/grid/use-get-number-of-blocks-before-cell.js
diff --git a/packages/block-editor/src/components/grid-visualizer/use-grid-layout-sync.js b/packages/block-editor/src/components/grid/use-grid-layout-sync.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/use-grid-layout-sync.js
rename to packages/block-editor/src/components/grid/use-grid-layout-sync.js
diff --git a/packages/block-editor/src/components/grid-visualizer/utils.js b/packages/block-editor/src/components/grid/utils.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/utils.js
rename to packages/block-editor/src/components/grid/utils.js
diff --git a/packages/block-editor/src/hooks/layout-child.js b/packages/block-editor/src/hooks/layout-child.js
index d92d1069c2e33c..f5104213729366 100644
--- a/packages/block-editor/src/hooks/layout-child.js
+++ b/packages/block-editor/src/hooks/layout-child.js
@@ -15,7 +15,7 @@ import {
 	GridVisualizer,
 	GridItemResizer,
 	GridItemMovers,
-} from '../components/grid-visualizer';
+} from '../components/grid';
 
 function useBlockPropsChildLayoutStyles( { style } ) {
 	const shouldRenderChildLayoutStyles = useSelect( ( select ) => {
diff --git a/packages/block-editor/src/layouts/grid.js b/packages/block-editor/src/layouts/grid.js
index 6a42d6898697f4..744441b22608b1 100644
--- a/packages/block-editor/src/layouts/grid.js
+++ b/packages/block-editor/src/layouts/grid.js
@@ -23,10 +23,7 @@ import { appendSelectors, getBlockGapCSS } from './utils';
 import { getGapCSSValue } from '../hooks/gap';
 import { shouldSkipSerialization } from '../hooks/utils';
 import { LAYOUT_DEFINITIONS } from './definitions';
-import {
-	GridVisualizer,
-	useGridLayoutSync,
-} from '../components/grid-visualizer';
+import { GridVisualizer, useGridLayoutSync } from '../components/grid';
 
 const RANGE_CONTROL_MAX_VALUES = {
 	px: 600,
diff --git a/packages/block-editor/src/style.scss b/packages/block-editor/src/style.scss
index cf4683b02c707d..0772ddf0d31e57 100644
--- a/packages/block-editor/src/style.scss
+++ b/packages/block-editor/src/style.scss
@@ -27,7 +27,7 @@
 @import "./components/duotone-control/style.scss";
 @import "./components/font-appearance-control/style.scss";
 @import "./components/global-styles/style.scss";
-@import "./components/grid-visualizer/style.scss";
+@import "./components/grid/style.scss";
 @import "./components/height-control/style.scss";
 @import "./components/image-size-control/style.scss";
 @import "./components/inserter-list-item/style.scss";