diff --git a/packages/nocodb/src/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
index c78a00ed47..baea4c8d20 100644
--- a/packages/nocodb/src/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
@@ -1,16 +1,16 @@
 import debug from 'debug';
 import boxen from 'boxen';
-import ncAttachmentUpgrader from './ncAttachmentUpgrader';
-import ncAttachmentUpgrader_0104002 from './ncAttachmentUpgrader_0104002';
-import ncStickyColumnUpgrader from './ncStickyColumnUpgrader';
-import ncFilterUpgrader_0104004 from './ncFilterUpgrader_0104004';
-import ncFilterUpgrader_0105003 from './ncFilterUpgrader_0105003';
-import ncFilterUpgrader from './ncFilterUpgrader';
-import ncHookUpgrader from './ncHookUpgrader';
-import ncProjectConfigUpgrader from './ncProjectConfigUpgrader';
-import ncXcdbLTARUpgrader from './ncXcdbLTARUpgrader';
-import ncXcdbLTARIndexUpgrader from './ncXcdbLTARIndexUpgrader';
-import ncXcdbCreatedAndUpdatedSystemFieldsUpgrader from './ncXcdbCreatedAndUpdatedSystemFieldsUpgrader';
+import ncAttachmentUpgrader from './upgraders/0101002_ncAttachmentUpgrader';
+import ncAttachmentUpgrader_0104002 from './upgraders/0104002_ncAttachmentUpgrader';
+import ncStickyColumnUpgrader from './upgraders/0105002_ncStickyColumnUpgrader';
+import ncFilterUpgrader_0104004 from './upgraders/0104004_ncFilterUpgrader';
+import ncFilterUpgrader_0105003 from './upgraders/0105003_ncFilterUpgrader';
+import ncFilterUpgrader from './upgraders/0100002_ncFilterUpgrader';
+import ncHookUpgrader from './upgraders/0105004_ncHookUpgrader';
+import ncProjectConfigUpgrader from './upgraders/0107004_ncProjectConfigUpgrader';
+import ncXcdbLTARUpgrader from './upgraders/0108002_ncXcdbLTARUpgrader';
+import ncXcdbLTARIndexUpgrader from './upgraders/0111002_ncXcdbLTARIndexUpgrader';
+import ncXcdbCreatedAndUpdatedSystemFieldsUpgrader from './upgraders/0111005_ncXcdbCreatedAndUpdatedSystemFieldsUpgrader';
 import type { MetaService } from '~/meta/meta.service';
 import type { NcConfig } from '~/interface/config';
 import { T } from '~/utils';
diff --git a/packages/nocodb/src/version-upgrader/ncFilterUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0100002_ncFilterUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncFilterUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0100002_ncFilterUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncAttachmentUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0101002_ncAttachmentUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncAttachmentUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0101002_ncAttachmentUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncAttachmentUpgrader_0104002.ts b/packages/nocodb/src/version-upgrader/upgraders/0104002_ncAttachmentUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncAttachmentUpgrader_0104002.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0104002_ncAttachmentUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts b/packages/nocodb/src/version-upgrader/upgraders/0104004_ncFilterUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0104004_ncFilterUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncStickyColumnUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0105002_ncStickyColumnUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncStickyColumnUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0105002_ncStickyColumnUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0105003.ts b/packages/nocodb/src/version-upgrader/upgraders/0105003_ncFilterUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncFilterUpgrader_0105003.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0105003_ncFilterUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncHookUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0105004_ncHookUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncHookUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0105004_ncHookUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncProjectConfigUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0107004_ncProjectConfigUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncProjectConfigUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0107004_ncProjectConfigUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0108002_ncXcdbLTARUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncXcdbLTARUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0108002_ncXcdbLTARUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0111002_ncXcdbLTARIndexUpgrader.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0111002_ncXcdbLTARIndexUpgrader.ts
diff --git a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts b/packages/nocodb/src/version-upgrader/upgraders/0111005_ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts
similarity index 99%
rename from packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0111005_ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts
index a5dc93bc29..cb52b9415b 100644
--- a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/upgraders/0111005_ncXcdbCreatedAndUpdatedSystemFieldsUpgrader.ts
@@ -1,5 +1,5 @@
 import { UITypes } from 'nocodb-sdk';
-import type { NcUpgraderCtx } from './NcUpgrader';
+import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
 import type { MetaService } from '~/meta/meta.service';
 import type { Base } from '~/models';
 import Noco from '~/Noco';
diff --git a/packages/nocodb/src/version-upgrader/ncDatasourceDecrypt.ts b/packages/nocodb/src/version-upgrader/upgraders/0225002_ncDatasourceDecrypt.ts
similarity index 100%
rename from packages/nocodb/src/version-upgrader/ncDatasourceDecrypt.ts
rename to packages/nocodb/src/version-upgrader/upgraders/0225002_ncDatasourceDecrypt.ts