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 99%
rename from packages/block-editor/src/components/grid-visualizer/grid-visualizer.js
rename to packages/block-editor/src/components/grid/grid-visualizer.js
index 36b3badb979ab..5e639615a062c 100644
--- a/packages/block-editor/src/components/grid-visualizer/grid-visualizer.js
+++ b/packages/block-editor/src/components/grid/grid-visualizer.js
@@ -42,7 +42,7 @@ export function GridVisualizer( { clientId, contentRef, parentLayout } ) {
 			ref={ contentRef }
 		/>
 	);
-} );
+}
 
 const GridVisualizerGrid = forwardRef(
 	( { clientId, gridElement, isManualGrid }, ref ) => {
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-blocks-before-current-cell.js b/packages/block-editor/src/components/grid/use-get-blocks-before-current-cell.js
similarity index 100%
rename from packages/block-editor/src/components/grid-visualizer/use-get-blocks-before-current-cell.js
rename to packages/block-editor/src/components/grid/use-get-blocks-before-current-cell.js
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 1430d39cb3ae4..74532ee503734 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 711fc1ff92ba1..f42231c29db72 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,