diff --git a/packages/nocodb/src/lib/controllers/dataApis/bulkDataAliasController.ts b/packages/nocodb/src/lib/controllers/dataControllers/bulkDataAliasController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/bulkDataAliasController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/bulkDataAliasController.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/dataAliasController.ts b/packages/nocodb/src/lib/controllers/dataControllers/dataAliasController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/dataAliasController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/dataAliasController.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/dataAliasExportController.ts b/packages/nocodb/src/lib/controllers/dataControllers/dataAliasExportController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/dataAliasExportController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/dataAliasExportController.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/dataAliasNestedController.ts b/packages/nocodb/src/lib/controllers/dataControllers/dataAliasNestedController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/dataAliasNestedController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/dataAliasNestedController.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/dataController.ts b/packages/nocodb/src/lib/controllers/dataControllers/dataController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/dataController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/dataController.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/helpers.ts b/packages/nocodb/src/lib/controllers/dataControllers/helpers.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/helpers.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/helpers.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/index.ts b/packages/nocodb/src/lib/controllers/dataControllers/index.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/index.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/index.ts
diff --git a/packages/nocodb/src/lib/controllers/dataApis/oldDataController.ts b/packages/nocodb/src/lib/controllers/dataControllers/oldDataController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/dataApis/oldDataController.ts
rename to packages/nocodb/src/lib/controllers/dataControllers/oldDataController.ts
diff --git a/packages/nocodb/src/lib/controllers/exportController.ts b/packages/nocodb/src/lib/controllers/exportController.ts
index 1c043acff1..38ae156cb9 100644
--- a/packages/nocodb/src/lib/controllers/exportController.ts
+++ b/packages/nocodb/src/lib/controllers/exportController.ts
@@ -1,7 +1,7 @@
 import { Request, Response, Router } from 'express';
 import View from '../models/View';
 import ncMetaAclMw from '../meta/helpers/ncMetaAclMw';
-import { extractCsvData } from './dataApis/helpers';
+import { extractCsvData } from './dataControllers/helpers';
 
 async function exportCsv(req: Request, res: Response) {
   const view = await View.get(req.params.viewId);
diff --git a/packages/nocodb/src/lib/controllers/public/index.ts b/packages/nocodb/src/lib/controllers/publicControllers/index.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/public/index.ts
rename to packages/nocodb/src/lib/controllers/publicControllers/index.ts
diff --git a/packages/nocodb/src/lib/controllers/public/publicDataController.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicDataController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/public/publicDataController.ts
rename to packages/nocodb/src/lib/controllers/publicControllers/publicDataController.ts
diff --git a/packages/nocodb/src/lib/controllers/public/publicDataExportController.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicDataExportController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/public/publicDataExportController.ts
rename to packages/nocodb/src/lib/controllers/publicControllers/publicDataExportController.ts
diff --git a/packages/nocodb/src/lib/controllers/public/publicMetaController.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMetaController.ts
similarity index 100%
rename from packages/nocodb/src/lib/controllers/public/publicMetaController.ts
rename to packages/nocodb/src/lib/controllers/publicControllers/publicMetaController.ts
diff --git a/packages/nocodb/src/lib/meta/api/index.ts b/packages/nocodb/src/lib/meta/api/index.ts
index b7f89d7ff0..6b9176188a 100644
--- a/packages/nocodb/src/lib/meta/api/index.ts
+++ b/packages/nocodb/src/lib/meta/api/index.ts
@@ -41,12 +41,12 @@ import {
   dataAliasNestedController,
   dataController,
   oldDataController,
-} from '../../controllers/dataApis';
+} from '../../controllers/dataControllers';
 import {
   publicDataController,
   publicDataExportController,
   publicMetaController,
-} from '../../controllers/public';
+} from '../../controllers/publicControllers';
 import { Server, Socket } from 'socket.io';
 import passport from 'passport';