diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
index cfa1b0c9b5..abe8936a6e 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -562,8 +562,9 @@ describe('blog plugin', () => {
     const noDateSource = path.posix.join('@site', PluginPath, 'no date.md');
     const noDateSourceFile = path.posix.join(siteDir, PluginPath, 'no date.md');
     // We know the file exists and we know we have git
-    const result = await getFileCommitDate(noDateSourceFile, {age: 'oldest'});
-    const noDateSourceTime = result.date;
+    const noDateSourceTime = (
+      await getFileCommitDate(noDateSourceFile, {age: 'oldest'})
+    ).date;
 
     expect({
       ...getByTitle(blogPosts, 'no date').metadata,
diff --git a/packages/docusaurus-utils/src/index.ts b/packages/docusaurus-utils/src/index.ts
index 46c8616e48..7f0151e622 100644
--- a/packages/docusaurus-utils/src/index.ts
+++ b/packages/docusaurus-utils/src/index.ts
@@ -25,10 +25,12 @@ export {
 } from './constants';
 export {generate, readOutputHTMLFile} from './emitUtils';
 export {
+  // TODO Docusaurus v4: remove these legacy exports,
+  //  they are only kept for retro-compatibility
   getFileCommitDate,
   FileNotTrackedError,
   GitNotFoundError,
-} from './gitUtils';
+} from './vcs/gitUtils';
 export {
   mergeTranslations,
   updateTranslationFileMessages,
@@ -129,6 +131,6 @@ export {
   type FrontMatterLastUpdate,
 } from './lastUpdateUtils';
 
-export {DEFAULT_VCS_CONFIG} from './vcsUtils';
+export {DEFAULT_VCS_CONFIG} from './vcs/vcsUtils';
 
 export {normalizeTags, reportInlineTags} from './tags';
diff --git a/packages/docusaurus-utils/src/lastUpdateUtils.ts b/packages/docusaurus-utils/src/lastUpdateUtils.ts
index b9a05676e9..c844ce284a 100644
--- a/packages/docusaurus-utils/src/lastUpdateUtils.ts
+++ b/packages/docusaurus-utils/src/lastUpdateUtils.ts
@@ -11,8 +11,8 @@ import {
   FileNotTrackedError,
   GitNotFoundError,
   getFileCommitDate,
-} from './gitUtils';
-import {DEFAULT_VCS_CONFIG} from './vcsUtils';
+} from './vcs/gitUtils';
+import {DEFAULT_VCS_CONFIG} from './vcs/vcsUtils';
 import type {PluginOptions, VcsConfig} from '@docusaurus/types';
 
 export type LastUpdateData = {
diff --git a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts b/packages/docusaurus-utils/src/vcs/__tests__/gitUtils.test.ts
similarity index 98%
rename from packages/docusaurus-utils/src/__tests__/gitUtils.test.ts
rename to packages/docusaurus-utils/src/vcs/__tests__/gitUtils.test.ts
index 52d0687f2e..7069dcbcd5 100644
--- a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts
+++ b/packages/docusaurus-utils/src/vcs/__tests__/gitUtils.test.ts
@@ -9,7 +9,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import {createTempRepo} from '@testing-utils/git';
 import {FileNotTrackedError, getFileCommitDate} from '../gitUtils';
-import {getGitLastUpdate} from '../lastUpdateUtils';
+import {getGitLastUpdate} from '../../lastUpdateUtils';
 
 /* eslint-disable no-restricted-properties */
 function initializeTempRepo() {
diff --git a/packages/docusaurus-utils/src/gitUtils.ts b/packages/docusaurus-utils/src/vcs/gitUtils.ts
similarity index 100%
rename from packages/docusaurus-utils/src/gitUtils.ts
rename to packages/docusaurus-utils/src/vcs/gitUtils.ts
diff --git a/packages/docusaurus-utils/src/vcsUtils.ts b/packages/docusaurus-utils/src/vcs/vcsUtils.ts
similarity index 97%
rename from packages/docusaurus-utils/src/vcsUtils.ts
rename to packages/docusaurus-utils/src/vcs/vcsUtils.ts
index 32ceefc435..37b249a0c0 100644
--- a/packages/docusaurus-utils/src/vcsUtils.ts
+++ b/packages/docusaurus-utils/src/vcs/vcsUtils.ts
@@ -10,7 +10,7 @@ import {
   getFileCommitDate,
   GitNotFoundError,
 } from './gitUtils';
-import {getLastUpdate} from './lastUpdateUtils';
+import {getLastUpdate} from '../lastUpdateUtils';
 import type {VcsConfig} from '@docusaurus/types';
 
 export const DEFAULT_VCS_CONFIG: VcsConfig = {