diff --git a/tests/playwright/tests/db/columnAttachments.spec.ts b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnAttachments.spec.ts
rename to tests/playwright/tests/db/columns/columnAttachments.spec.ts
index 7593457cde..69ea59dea5 100644
--- a/tests/playwright/tests/db/columnAttachments.spec.ts
+++ b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SharedFormPage } from '../../pages/SharedForm';
-import setup from '../../setup';
-import { AccountPage } from '../../pages/Account';
-import { AccountLicensePage } from '../../pages/Account/License';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SharedFormPage } from '../../../pages/SharedForm';
+import setup from '../../../setup';
+import { AccountPage } from '../../../pages/Account';
+import { AccountLicensePage } from '../../../pages/Account/License';
 
 test.describe('Attachment column', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnBarcode.spec.ts b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/columnBarcode.spec.ts
rename to tests/playwright/tests/db/columns/columnBarcode.spec.ts
index 783ce1eae5..8f20c53548 100644
--- a/tests/playwright/tests/db/columnBarcode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 interface ExpectedBarcodeData {
   referencedValue: string;
diff --git a/tests/playwright/tests/db/columnCheckbox.spec.ts b/tests/playwright/tests/db/columns/columnCheckbox.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnCheckbox.spec.ts
rename to tests/playwright/tests/db/columns/columnCheckbox.spec.ts
index b0e1d94c50..b652ce4c1b 100644
--- a/tests/playwright/tests/db/columnCheckbox.spec.ts
+++ b/tests/playwright/tests/db/columns/columnCheckbox.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/columnDateTime.spec.ts b/tests/playwright/tests/db/columns/columnDateTime.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnDateTime.spec.ts
rename to tests/playwright/tests/db/columns/columnDateTime.spec.ts
index 7647dea6b3..2428e5d295 100644
--- a/tests/playwright/tests/db/columnDateTime.spec.ts
+++ b/tests/playwright/tests/db/columns/columnDateTime.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 const dateTimeData = [
   {
diff --git a/tests/playwright/tests/db/columnDuration.spec.ts b/tests/playwright/tests/db/columns/columnDuration.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnDuration.spec.ts
rename to tests/playwright/tests/db/columns/columnDuration.spec.ts
index 6998c55062..37acd515f4 100644
--- a/tests/playwright/tests/db/columnDuration.spec.ts
+++ b/tests/playwright/tests/db/columns/columnDuration.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 // Storing one additional dummy value "10" at end of every input array
 // this will trigger update to previously committed data
diff --git a/tests/playwright/tests/db/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnFormula.spec.ts
rename to tests/playwright/tests/db/columns/columnFormula.spec.ts
index 18ddb182af..1754328694 100644
--- a/tests/playwright/tests/db/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup, { NcContext } from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup, { NcContext } from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
diff --git a/tests/playwright/tests/db/columnGeoData.spec.ts b/tests/playwright/tests/db/columns/columnGeoData.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/columnGeoData.spec.ts
rename to tests/playwright/tests/db/columns/columnGeoData.spec.ts
index 29e35ce5e7..5ea8982b35 100644
--- a/tests/playwright/tests/db/columnGeoData.spec.ts
+++ b/tests/playwright/tests/db/columns/columnGeoData.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 test.describe('Geo Data column', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
rename to tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 1be725e05d..3487138d3c 100644
--- a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('LTAR create & update', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLookupRollup.spec.ts b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/columnLookupRollup.spec.ts
rename to tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
index 236b94d5ed..d78f10724a 100644
--- a/tests/playwright/tests/db/columnLookupRollup.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Virtual columns', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/columnLtarDragdrop.spec.ts
rename to tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
index 527789aa2f..06cd602333 100644
--- a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
@@ -1,9 +1,9 @@
 import { expect, Locator, test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { getTextExcludeIconText } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { getTextExcludeIconText } from '../../utils/general';
 let api: Api<any>;
 const recordCount = 10;
 
diff --git a/tests/playwright/tests/db/columnMenuOperations.spec.ts b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnMenuOperations.spec.ts
rename to tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
index fc2c16149a..09bf3df5c4 100644
--- a/tests/playwright/tests/db/columnMenuOperations.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 const columns = [
   {
diff --git a/tests/playwright/tests/db/columnMultiSelect.spec.ts b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnMultiSelect.spec.ts
rename to tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
index 029830a155..583b5dd241 100644
--- a/tests/playwright/tests/db/columnMultiSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Multi select', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/columnQrCode.spec.ts b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/columnQrCode.spec.ts
rename to tests/playwright/tests/db/columns/columnQrCode.spec.ts
index 603601c686..0b8ace1575 100644
--- a/tests/playwright/tests/db/columnQrCode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 type ExpectedQrCodeData = {
   referencedValue: string;
diff --git a/tests/playwright/tests/db/columnRating.spec.ts b/tests/playwright/tests/db/columns/columnRating.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/columnRating.spec.ts
rename to tests/playwright/tests/db/columns/columnRating.spec.ts
index d11916fdee..cbed0b6d0a 100644
--- a/tests/playwright/tests/db/columnRating.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRating.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Rating - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
diff --git a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
rename to tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
index 25fb924d66..60e71ef8de 100644
--- a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Relational Columns', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnSingleSelect.spec.ts b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnSingleSelect.spec.ts
rename to tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
index 9e5302f5fc..6b276a11c6 100644
--- a/tests/playwright/tests/db/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Single select', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/baseShare.spec.ts b/tests/playwright/tests/db/features/baseShare.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/baseShare.spec.ts
rename to tests/playwright/tests/db/features/baseShare.spec.ts
index e9d83a5be1..a63e80d2aa 100644
--- a/tests/playwright/tests/db/baseShare.spec.ts
+++ b/tests/playwright/tests/db/features/baseShare.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { LoginPage } from '../../pages/LoginPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { LoginPage } from '../../../pages/LoginPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('Shared base', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/erd.spec.ts b/tests/playwright/tests/db/features/erd.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/erd.spec.ts
rename to tests/playwright/tests/db/features/erd.spec.ts
index 698847010c..f0dbef7044 100644
--- a/tests/playwright/tests/db/erd.spec.ts
+++ b/tests/playwright/tests/db/features/erd.spec.ts
@@ -5,13 +5,13 @@ import {
   pgSakilaSqlViews,
   pgSakilaTables,
   sqliteSakilaSqlViews,
-} from '../utils/sakila';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsSubTab, SettingTab } from '../../pages/Dashboard/Settings';
-import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
-import { SettingsErdPage } from '../../pages/Dashboard/Settings/Erd';
-import { defaultBaseName } from '../../constants';
+} from '../../utils/sakila';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsSubTab, SettingTab } from '../../../pages/Dashboard/Settings';
+import setup from '../../../setup';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
+import { SettingsErdPage } from '../../../pages/Dashboard/Settings/Erd';
+import { defaultBaseName } from '../../../constants';
 
 test.describe('Erd', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/expandedFormUrl.spec.ts b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/expandedFormUrl.spec.ts
rename to tests/playwright/tests/db/features/expandedFormUrl.spec.ts
index 78b7b28bf0..7f78db0498 100644
--- a/tests/playwright/tests/db/expandedFormUrl.spec.ts
+++ b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GalleryPage } from '../../pages/Dashboard/Gallery';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GalleryPage } from '../../../pages/Dashboard/Gallery';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Expanded form URL', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/features/filters.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/filters.spec.ts
rename to tests/playwright/tests/db/features/filters.spec.ts
index 162cfda00e..ec706fcd51 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/features/filters.spec.ts
@@ -1,13 +1,13 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
-import { rowMixedValue } from '../../setup/xcdb-records';
+import { rowMixedValue } from '../../../setup/xcdb-records';
 import dayjs from 'dayjs';
-import { createDemoTable } from '../../setup/demoTable';
-import { isPg } from '../../setup/db';
+import { createDemoTable } from '../../../setup/demoTable';
+import { isPg } from '../../../setup/db';
 
 let dashboard: DashboardPage, toolbar: ToolbarPage;
 let context: any;
diff --git a/tests/playwright/tests/db/findRowByScanner.spec.ts b/tests/playwright/tests/db/features/findRowByScanner.spec.ts
similarity index 79%
rename from tests/playwright/tests/db/findRowByScanner.spec.ts
rename to tests/playwright/tests/db/features/findRowByScanner.spec.ts
index 167412c99e..1d676755cc 100644
--- a/tests/playwright/tests/db/findRowByScanner.spec.ts
+++ b/tests/playwright/tests/db/features/findRowByScanner.spec.ts
@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import setup from '../../../setup';
 
 // Skip for now as it is not working in CI atm
 test.describe.skip('Find row by scanner', () => {
diff --git a/tests/playwright/tests/db/import.spec.ts b/tests/playwright/tests/db/features/import.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/import.spec.ts
rename to tests/playwright/tests/db/features/import.spec.ts
index 9a8167d004..d57a819b67 100644
--- a/tests/playwright/tests/db/import.spec.ts
+++ b/tests/playwright/tests/db/features/import.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { airtableApiBase, airtableApiKey } from '../../constants';
-import { DashboardPage } from '../../pages/Dashboard';
-import { quickVerify } from '../../quickTests/commonTest';
-import setup from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import { airtableApiBase, airtableApiKey } from '../../../constants';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { quickVerify } from '../../../quickTests/commonTest';
+import setup from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 test.describe('Import', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/keyboardShortcuts.spec.ts
rename to tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index 43b29ae1ad..06ca67800a 100644
--- a/tests/playwright/tests/db/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
 
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/language.spec.ts b/tests/playwright/tests/db/features/language.spec.ts
similarity index 84%
rename from tests/playwright/tests/db/language.spec.ts
rename to tests/playwright/tests/db/features/language.spec.ts
index d78b049e16..b1dc55a035 100644
--- a/tests/playwright/tests/db/language.spec.ts
+++ b/tests/playwright/tests/db/features/language.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import setup from '../../../setup';
 
 const langMenu = [
   'help-translate',
@@ -58,7 +58,7 @@ test.describe('Common', () => {
     // Index is the order in which menu options appear
     for (let i = 1; i < langMenu.length; i++) {
       // scripts/playwright/tests/language.spec.ts
-      const json = require(`../../../../packages/nc-gui/lang/${langMenu[i]}`);
+      const json = require(`../../../../../packages/nc-gui/lang/${langMenu[i]}`);
       await projectsPage.openLanguageMenu();
       await projectsPage.selectLanguage({ index: i });
       await projectsPage.verifyLanguage({ json });
diff --git a/tests/playwright/tests/db/metaLTAR.spec.ts b/tests/playwright/tests/db/features/metaLTAR.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/metaLTAR.spec.ts
rename to tests/playwright/tests/db/features/metaLTAR.spec.ts
index 7205c37c33..590e4e35d2 100644
--- a/tests/playwright/tests/db/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/features/metaLTAR.spec.ts
@@ -20,13 +20,12 @@
  */
 
 import { test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { createXcdb, deleteXcdb } from '../../setup/xcdbProject';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { createXcdb, deleteXcdb } from '../../../setup/xcdbProject';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
 let api: Api<any>;
 const recordCount = 10;
 
diff --git a/tests/playwright/tests/db/metaSync.spec.ts b/tests/playwright/tests/db/features/metaSync.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/metaSync.spec.ts
rename to tests/playwright/tests/db/features/metaSync.spec.ts
index a0f3f9ee55..a9f84ec630 100644
--- a/tests/playwright/tests/db/metaSync.spec.ts
+++ b/tests/playwright/tests/db/features/metaSync.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import setup, { NcContext } from '../../setup';
-import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import setup, { NcContext } from '../../../setup';
+import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../../../setup/db';
 
 test.describe('Meta sync', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/mobileMode.spec.ts b/tests/playwright/tests/db/features/mobileMode.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/mobileMode.spec.ts
rename to tests/playwright/tests/db/features/mobileMode.spec.ts
index 997c3b958a..d5a2806b44 100644
--- a/tests/playwright/tests/db/mobileMode.spec.ts
+++ b/tests/playwright/tests/db/features/mobileMode.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import setup from '../../../setup';
 
 test.describe('Mobile Mode', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/pagination.spec.ts b/tests/playwright/tests/db/features/pagination.spec.ts
similarity index 89%
rename from tests/playwright/tests/db/pagination.spec.ts
rename to tests/playwright/tests/db/features/pagination.spec.ts
index 45b7040c88..9342245b2f 100644
--- a/tests/playwright/tests/db/pagination.spec.ts
+++ b/tests/playwright/tests/db/features/pagination.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Grid pagination', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/swagger.spec.ts b/tests/playwright/tests/db/features/swagger.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/swagger.spec.ts
rename to tests/playwright/tests/db/features/swagger.spec.ts
index 05b51f7568..714f02f57a 100644
--- a/tests/playwright/tests/db/swagger.spec.ts
+++ b/tests/playwright/tests/db/features/swagger.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/timezone.spec.ts b/tests/playwright/tests/db/features/timezone.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/timezone.spec.ts
rename to tests/playwright/tests/db/features/timezone.spec.ts
index 562914cec3..7946b825c8 100644
--- a/tests/playwright/tests/db/timezone.spec.ts
+++ b/tests/playwright/tests/db/features/timezone.spec.ts
@@ -1,12 +1,12 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 import { knex } from 'knex';
 import { Api, UITypes } from 'nocodb-sdk';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
-import { getKnexConfig } from '../utils/config';
-import { getBrowserTimezoneOffset } from '../utils/general';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
+import { getKnexConfig } from '../../utils/config';
+import { getBrowserTimezoneOffset } from '../../utils/general';
 let api: Api<any>, records: any[];
 
 const columns = [
diff --git a/tests/playwright/tests/db/undo-redo.spec.ts b/tests/playwright/tests/db/features/undo-redo.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/undo-redo.spec.ts
rename to tests/playwright/tests/db/features/undo-redo.spec.ts
index 52b402bf4c..4d50603749 100644
--- a/tests/playwright/tests/db/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/features/undo-redo.spec.ts
@@ -1,11 +1,11 @@
 import { expect, Page, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { rowMixedValue } from '../../setup/xcdb-records';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { isSqlite } from '../../setup/db';
+import { rowMixedValue } from '../../../setup/xcdb-records';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { isSqlite } from '../../../setup/db';
 
 let dashboard: DashboardPage,
   grid: GridPage,
diff --git a/tests/playwright/tests/db/updateBulk.ts b/tests/playwright/tests/db/features/updateBulk.ts
similarity index 96%
rename from tests/playwright/tests/db/updateBulk.ts
rename to tests/playwright/tests/db/features/updateBulk.ts
index f1482f6fc3..ccebe38132 100644
--- a/tests/playwright/tests/db/updateBulk.ts
+++ b/tests/playwright/tests/db/features/updateBulk.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
-import setup from '../../setup';
-import { DashboardPage } from '../../pages/Dashboard';
+import setup from '../../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
 import { Api } from 'nocodb-sdk';
-import { createDemoTable } from '../../setup/demoTable';
-import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
-import { AccountLicensePage } from '../../pages/Account/License';
-import { AccountPage } from '../../pages/Account';
+import { createDemoTable } from '../../../setup/demoTable';
+import { BulkUpdatePage } from '../../../pages/Dashboard/BulkUpdate';
+import { AccountLicensePage } from '../../../pages/Account/License';
+import { AccountPage } from '../../../pages/Account';
 
 let bulkUpdateForm: BulkUpdatePage;
 let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/features/verticalFillHandle.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/verticalFillHandle.spec.ts
rename to tests/playwright/tests/db/features/verticalFillHandle.spec.ts
index 7d62ea3784..f898622017 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/features/verticalFillHandle.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import setup from '../../setup';
-import { DashboardPage } from '../../pages/Dashboard';
+import setup from '../../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
 import { Api } from 'nocodb-sdk';
-import { createDemoTable } from '../../setup/demoTable';
-import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
+import { createDemoTable } from '../../../setup/demoTable';
+import { BulkUpdatePage } from '../../../pages/Dashboard/BulkUpdate';
 
 let dashboard: DashboardPage;
 let context: any;
diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/features/webhook.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/01-webhook.spec.ts
rename to tests/playwright/tests/db/features/webhook.spec.ts
index b02130544c..5952b1e31e 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/features/webhook.spec.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import makeServer from '../../setup/server';
-import { WebhookFormPage } from '../../pages/Dashboard/WebhookForm';
-import { isSubset } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import makeServer from '../../../setup/server';
+import { WebhookFormPage } from '../../../pages/Dashboard/WebhookForm';
+import { isSubset } from '../../utils/general';
 import { Api, UITypes } from 'nocodb-sdk';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
 
 const hookPath = 'http://localhost:9090/hook';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/cellSelection.spec.ts b/tests/playwright/tests/db/general/cellSelection.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/cellSelection.spec.ts
rename to tests/playwright/tests/db/general/cellSelection.spec.ts
index dde273b676..42a59589a7 100644
--- a/tests/playwright/tests/db/cellSelection.spec.ts
+++ b/tests/playwright/tests/db/general/cellSelection.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Verify cell selection', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/megaTable.spec.ts b/tests/playwright/tests/db/general/megaTable.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/megaTable.spec.ts
rename to tests/playwright/tests/db/general/megaTable.spec.ts
index b47c09ecf2..8b92b2533f 100644
--- a/tests/playwright/tests/db/megaTable.spec.ts
+++ b/tests/playwright/tests/db/general/megaTable.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/projectOperations.spec.ts b/tests/playwright/tests/db/general/projectOperations.spec.ts
similarity index 91%
rename from tests/playwright/tests/db/projectOperations.spec.ts
rename to tests/playwright/tests/db/general/projectOperations.spec.ts
index e1e9acb99d..a8e1deb10b 100644
--- a/tests/playwright/tests/db/projectOperations.spec.ts
+++ b/tests/playwright/tests/db/general/projectOperations.spec.ts
@@ -1,13 +1,13 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { airtableApiBase, airtableApiKey } from '../../constants';
-import { quickVerify } from '../../quickTests/commonTest';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { ProjectsPage } from '../../pages/ProjectsPage';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { airtableApiBase, airtableApiKey } from '../../../constants';
+import { quickVerify } from '../../../quickTests/commonTest';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
 import { Api } from 'nocodb-sdk';
-import { ProjectInfo, ProjectInfoApiUtil } from '../utils/projectInfoApiUtil';
-import { deepCompare } from '../utils/objectCompareUtil';
+import { ProjectInfo, ProjectInfoApiUtil } from '../../utils/projectInfoApiUtil';
+import { deepCompare } from '../../utils/objectCompareUtil';
 
 test.describe('Project operations', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/tableColumnOperation.spec.ts b/tests/playwright/tests/db/general/tableColumnOperation.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/tableColumnOperation.spec.ts
rename to tests/playwright/tests/db/general/tableColumnOperation.spec.ts
index 39fdc99de5..fc615db0df 100644
--- a/tests/playwright/tests/db/tableColumnOperation.spec.ts
+++ b/tests/playwright/tests/db/general/tableColumnOperation.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/tableOperations.spec.ts b/tests/playwright/tests/db/general/tableOperations.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/tableOperations.spec.ts
rename to tests/playwright/tests/db/general/tableOperations.spec.ts
index 21b72c62ff..6b47564c4e 100644
--- a/tests/playwright/tests/db/tableOperations.spec.ts
+++ b/tests/playwright/tests/db/general/tableOperations.spec.ts
@@ -1,10 +1,10 @@
 import { expect, test } from '@playwright/test';
 import { Api, TableListType, TableType } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { deepCompare } from '../utils/objectCompareUtil';
-import setup from '../../setup';
-import { ProjectInfoApiUtil, TableInfo } from '../utils/projectInfoApiUtil';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { deepCompare } from '../../utils/objectCompareUtil';
+import setup from '../../../setup';
+import { ProjectInfoApiUtil, TableInfo } from '../../utils/projectInfoApiUtil';
 
 test.describe('Table Operations', () => {
   let dashboard: DashboardPage, settings: SettingsPage;
diff --git a/tests/playwright/tests/db/toolbarOperations.spec.ts b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/toolbarOperations.spec.ts
rename to tests/playwright/tests/db/general/toolbarOperations.spec.ts
index 0aed159cd4..87f09652e9 100644
--- a/tests/playwright/tests/db/toolbarOperations.spec.ts
+++ b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import setup from '../../../setup';
 
 test.describe('Toolbar operations (GRID)', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
diff --git a/tests/playwright/tests/db/viewMenu.spec.ts b/tests/playwright/tests/db/general/viewMenu.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/viewMenu.spec.ts
rename to tests/playwright/tests/db/general/viewMenu.spec.ts
index 5a9f93471e..ab95392cf7 100644
--- a/tests/playwright/tests/db/viewMenu.spec.ts
+++ b/tests/playwright/tests/db/general/viewMenu.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { isPg } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { isPg } from '../../../setup/db';
 
 test.describe('Grid view locked', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/views.spec.ts b/tests/playwright/tests/db/general/views.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/views.spec.ts
rename to tests/playwright/tests/db/general/views.spec.ts
index 2ee1add7b9..56fce6970f 100644
--- a/tests/playwright/tests/db/views.spec.ts
+++ b/tests/playwright/tests/db/general/views.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import setup from '../../../setup';
 
 test.describe('Views CRUD Operations', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/accountLicense.spec.ts b/tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
similarity index 80%
rename from tests/playwright/tests/db/accountLicense.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
index ec3ab37502..52957dd825 100644
--- a/tests/playwright/tests/db/accountLicense.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import setup from '../../setup';
-import { AccountLicensePage } from '../../pages/Account/License';
-import { DashboardPage } from '../../pages/Dashboard';
+import { AccountPage } from '../../../pages/Account';
+import setup from '../../../setup';
+import { AccountLicensePage } from '../../../pages/Account/License';
+import { DashboardPage } from '../../../pages/Dashboard';
 
 test.describe('Enterprise License', () => {
   // @ts-ignore
diff --git a/tests/playwright/tests/db/accountTokenManagement.spec.ts b/tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
similarity index 82%
rename from tests/playwright/tests/db/accountTokenManagement.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
index 1cd9ace2eb..89bc82f108 100644
--- a/tests/playwright/tests/db/accountTokenManagement.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountTokenPage } from '../../pages/Account/Token';
-import setup from '../../setup';
+import { AccountPage } from '../../../pages/Account';
+import { AccountTokenPage } from '../../../pages/Account/Token';
+import setup from '../../../setup';
 
 test.describe('User roles', () => {
   let accountTokenPage: AccountTokenPage;
diff --git a/tests/playwright/tests/db/accountUserManagement.spec.ts b/tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/accountUserManagement.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
index 45b4a3c3da..5778fabd02 100644
--- a/tests/playwright/tests/db/accountUserManagement.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountUsersPage } from '../../pages/Account/Users';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { SignupPage } from '../../pages/SignupPage';
-import setup from '../../setup';
-import { getDefaultPwd } from '../utils/general';
+import { AccountPage } from '../../../pages/Account';
+import { AccountUsersPage } from '../../../pages/Account/Users';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { SignupPage } from '../../../pages/SignupPage';
+import setup from '../../../setup';
+import { getDefaultPwd } from '../../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'Organization Level Creator', url: '' },
diff --git a/tests/playwright/tests/db/accountUserSettings.spec.ts b/tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/accountUserSettings.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
index dd4904cd66..1cc5bac4c8 100644
--- a/tests/playwright/tests/db/accountUserSettings.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountSettingsPage } from '../../pages/Account/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import setup from '../../setup';
-import { getDefaultPwd } from '../utils/general';
+import { AccountPage } from '../../../pages/Account';
+import { AccountSettingsPage } from '../../../pages/Account/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import setup from '../../../setup';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('App settings', () => {
   let accountSettingsPage: AccountSettingsPage;
diff --git a/tests/playwright/tests/db/authChangePassword.spec.ts b/tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
similarity index 83%
rename from tests/playwright/tests/db/authChangePassword.spec.ts
rename to tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
index 82ec5be74f..f7f81245ae 100644
--- a/tests/playwright/tests/db/authChangePassword.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
@@ -1,12 +1,12 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { LoginPage } from '../../pages/LoginPage';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { AccountPage } from '../../pages/Account';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { LoginPage } from '../../../pages/LoginPage';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { AccountPage } from '../../../pages/Account';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('Auth', () => {
   let context: any;
diff --git a/tests/playwright/tests/db/rolesCreate.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/rolesCreate.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
index 672b77e4fa..e4c7f13902 100644
--- a/tests/playwright/tests/db/rolesCreate.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { getDefaultPwd } from '../../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'creator', url: '' },
diff --git a/tests/playwright/tests/db/rolesPreview.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/rolesPreview.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
index 16a9349767..8c29ea288b 100644
--- a/tests/playwright/tests/db/rolesPreview.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
 
 const roles = ['Editor', 'Commenter', 'Viewer'];
 
diff --git a/tests/playwright/tests/db/rolesSuperUser.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/rolesSuperUser.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
index f5fd01aeab..078720272b 100644
--- a/tests/playwright/tests/db/rolesSuperUser.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Super user', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewForm.spec.ts b/tests/playwright/tests/db/views/viewForm.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/viewForm.spec.ts
rename to tests/playwright/tests/db/views/viewForm.spec.ts
index 351e7fc0d3..5547997db4 100644
--- a/tests/playwright/tests/db/viewForm.spec.ts
+++ b/tests/playwright/tests/db/views/viewForm.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { FormPage } from '../../pages/Dashboard/Form';
-import { SharedFormPage } from '../../pages/SharedForm';
-import { AccountPage } from '../../pages/Account';
-import { AccountAppStorePage } from '../../pages/Account/AppStore';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import { SharedFormPage } from '../../../pages/SharedForm';
+import { AccountPage } from '../../../pages/Account';
+import { AccountAppStorePage } from '../../../pages/Account/AppStore';
 import { Api, UITypes } from 'nocodb-sdk';
 let api: Api<any>;
 
diff --git a/tests/playwright/tests/db/viewFormShareSurvey.spec.ts b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/viewFormShareSurvey.spec.ts
rename to tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
index b05528155d..c77528459c 100644
--- a/tests/playwright/tests/db/viewFormShareSurvey.spec.ts
+++ b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SurveyFormPage } from '../../pages/Dashboard/SurveyForm';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SurveyFormPage } from '../../../pages/Dashboard/SurveyForm';
+import setup from '../../../setup';
 
 test.describe('Share form', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewGridShare.spec.ts b/tests/playwright/tests/db/views/viewGridShare.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/viewGridShare.spec.ts
rename to tests/playwright/tests/db/views/viewGridShare.spec.ts
index 659979caaf..f904db429f 100644
--- a/tests/playwright/tests/db/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/views/viewGridShare.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
 
 test.describe('Shared view', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewKanban.spec.ts b/tests/playwright/tests/db/views/viewKanban.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/viewKanban.spec.ts
rename to tests/playwright/tests/db/views/viewKanban.spec.ts
index 6231f9636e..c4de4cbd4c 100644
--- a/tests/playwright/tests/db/viewKanban.spec.ts
+++ b/tests/playwright/tests/db/views/viewKanban.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
-import setup from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import setup from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 const filmRatings = ['G', 'PG', 'PG-13', 'R', 'NC-17'];
 
diff --git a/tests/playwright/tests/db/viewMap.spec.ts b/tests/playwright/tests/db/views/viewMap.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/viewMap.spec.ts
rename to tests/playwright/tests/db/views/viewMap.spec.ts
index d2ca547f17..23f957fe8d 100644
--- a/tests/playwright/tests/db/viewMap.spec.ts
+++ b/tests/playwright/tests/db/views/viewMap.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
-import setup from '../../setup';
+import setup from '../../../setup';
 
 test.describe('Map View', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;