diff --git a/e2e/avpFixtures.js b/e2e/fixtures/avpFixtures.js
similarity index 98%
rename from e2e/avpFixtures.js
rename to e2e/fixtures/avpFixtures.js
index fb99b94347..89e4ab1669 100644
--- a/e2e/avpFixtures.js
+++ b/e2e/fixtures/avpFixtures.js
@@ -35,7 +35,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { test, expect } = require('./pluginFixtures');
+const { test, expect } = require('../pluginFixtures');
 const AxeBuilder = require('@axe-core/playwright').default;
 
 // Constants for repeated values
diff --git a/e2e/baseFixtures.js b/e2e/fixtures/baseFixtures.js
similarity index 100%
rename from e2e/baseFixtures.js
rename to e2e/fixtures/baseFixtures.js
diff --git a/e2e/pluginFixtures.js b/e2e/fixtures/pluginFixtures.js
similarity index 100%
rename from e2e/pluginFixtures.js
rename to e2e/fixtures/pluginFixtures.js
diff --git a/e2e/tests/functional/branding.e2e.spec.js b/e2e/tests/functional/features/branding.e2e.spec.js
similarity index 97%
rename from e2e/tests/functional/branding.e2e.spec.js
rename to e2e/tests/functional/features/branding.e2e.spec.js
index 588af99940..3acc9e7548 100644
--- a/e2e/tests/functional/branding.e2e.spec.js
+++ b/e2e/tests/functional/features/branding.e2e.spec.js
@@ -24,7 +24,7 @@
 This test suite is dedicated to tests which verify branding related components.
 */
 
-const { test, expect } = require('../../baseFixtures.js');
+const { test, expect } = require('../../../baseFixtures.js');
 
 test.describe('Branding tests', () => {
   test('About Modal launches with basic branding properties', async ({ page }) => {
diff --git a/e2e/tests/functional/clearDataAction.e2e.spec.js b/e2e/tests/functional/features/clearDataAction.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/clearDataAction.e2e.spec.js
rename to e2e/tests/functional/features/clearDataAction.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/clocks/clock.e2e.spec.js b/e2e/tests/functional/features/clocks/clock.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
rename to e2e/tests/functional/features/clocks/clock.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js b/e2e/tests/functional/features/clocks/remoteClock.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
rename to e2e/tests/functional/features/clocks/remoteClock.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js b/e2e/tests/functional/features/conditionSet/conditionSet.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
rename to e2e/tests/functional/features/conditionSet/conditionSet.e2e.spec.js
diff --git a/e2e/tests/functional/couchdb.e2e.spec.js b/e2e/tests/functional/features/couchdb.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/couchdb.e2e.spec.js
rename to e2e/tests/functional/features/couchdb.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js b/e2e/tests/functional/features/displayLayout/displayLayout.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js
rename to e2e/tests/functional/features/displayLayout/displayLayout.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js b/e2e/tests/functional/features/faultManagement/faultManagement.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js
rename to e2e/tests/functional/features/faultManagement/faultManagement.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js b/e2e/tests/functional/features/flexibleLayout/flexibleLayout.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js
rename to e2e/tests/functional/features/flexibleLayout/flexibleLayout.e2e.spec.js
diff --git a/e2e/tests/functional/forms.e2e.spec.js b/e2e/tests/functional/features/forms.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/forms.e2e.spec.js
rename to e2e/tests/functional/features/forms.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/gauge/gauge.e2e.spec.js b/e2e/tests/functional/features/gauge/gauge.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/gauge/gauge.e2e.spec.js
rename to e2e/tests/functional/features/gauge/gauge.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js b/e2e/tests/functional/features/imagery/exampleImagery.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
rename to e2e/tests/functional/features/imagery/exampleImagery.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js b/e2e/tests/functional/features/importAndExportAsJSON/exportAsJson.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
rename to e2e/tests/functional/features/importAndExportAsJSON/exportAsJson.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js b/e2e/tests/functional/features/importAndExportAsJSON/importAsJson.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
rename to e2e/tests/functional/features/importAndExportAsJSON/importAsJson.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/inspectorDataVisualization/numericData.e2e.spec.js b/e2e/tests/functional/features/inspectorDataVisualization/numericData.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/inspectorDataVisualization/numericData.e2e.spec.js
rename to e2e/tests/functional/features/inspectorDataVisualization/numericData.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/lad/lad.e2e.spec.js b/e2e/tests/functional/features/lad/lad.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/lad/lad.e2e.spec.js
rename to e2e/tests/functional/features/lad/lad.e2e.spec.js
diff --git a/e2e/tests/functional/menu.e2e.spec.js b/e2e/tests/functional/features/menu.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/menu.e2e.spec.js
rename to e2e/tests/functional/features/menu.e2e.spec.js
diff --git a/e2e/tests/functional/moveAndLinkObjects.e2e.spec.js b/e2e/tests/functional/features/moveAndLinkObjects.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/moveAndLinkObjects.e2e.spec.js
rename to e2e/tests/functional/features/moveAndLinkObjects.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js b/e2e/tests/functional/features/notebook/notebook.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
rename to e2e/tests/functional/features/notebook/notebook.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/notebook/notebookSnapshots.e2e.spec.js b/e2e/tests/functional/features/notebook/notebookSnapshots.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/notebook/notebookSnapshots.e2e.spec.js
rename to e2e/tests/functional/features/notebook/notebookSnapshots.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/notebook/notebookWithCouchDB.e2e.spec.js b/e2e/tests/functional/features/notebook/notebookWithCouchDB.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/notebook/notebookWithCouchDB.e2e.spec.js
rename to e2e/tests/functional/features/notebook/notebookWithCouchDB.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js b/e2e/tests/functional/features/notebook/restrictedNotebook.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
rename to e2e/tests/functional/features/notebook/restrictedNotebook.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js b/e2e/tests/functional/features/notebook/tags.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
rename to e2e/tests/functional/features/notebook/tags.e2e.spec.js
diff --git a/e2e/tests/functional/notification.e2e.spec.js b/e2e/tests/functional/features/notification.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/notification.e2e.spec.js
rename to e2e/tests/functional/features/notification.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/operatorStatus/operatorStatus.e2e.spec.js b/e2e/tests/functional/features/operatorStatus/operatorStatus.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/operatorStatus/operatorStatus.e2e.spec.js
rename to e2e/tests/functional/features/operatorStatus/operatorStatus.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin.png b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin.png
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin.png
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin.png
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin.png b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin.png
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin.png
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin.png
diff --git a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png b/e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png
similarity index 100%
rename from e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png
rename to e2e/tests/functional/features/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png
diff --git a/e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js b/e2e/tests/functional/features/plot/logPlot.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
rename to e2e/tests/functional/features/plot/logPlot.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js b/e2e/tests/functional/features/plot/missingPlotObj.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
rename to e2e/tests/functional/features/plot/missingPlotObj.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/overlayPlot.e2e.spec.js b/e2e/tests/functional/features/plot/overlayPlot.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/overlayPlot.e2e.spec.js
rename to e2e/tests/functional/features/plot/overlayPlot.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/plotRendering.e2e.spec.js b/e2e/tests/functional/features/plot/plotRendering.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/plotRendering.e2e.spec.js
rename to e2e/tests/functional/features/plot/plotRendering.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/scatterPlot.e2e.spec.js b/e2e/tests/functional/features/plot/scatterPlot.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/scatterPlot.e2e.spec.js
rename to e2e/tests/functional/features/plot/scatterPlot.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/stackedPlot.e2e.spec.js b/e2e/tests/functional/features/plot/stackedPlot.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/stackedPlot.e2e.spec.js
rename to e2e/tests/functional/features/plot/stackedPlot.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/plot/tagging.e2e.spec.js b/e2e/tests/functional/features/plot/tagging.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/plot/tagging.e2e.spec.js
rename to e2e/tests/functional/features/plot/tagging.e2e.spec.js
diff --git a/e2e/tests/functional/recentObjects.e2e.spec.js b/e2e/tests/functional/features/recentObjects.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/recentObjects.e2e.spec.js
rename to e2e/tests/functional/features/recentObjects.e2e.spec.js
diff --git a/e2e/tests/functional/renaming.e2e.spec.js b/e2e/tests/functional/features/renaming.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/renaming.e2e.spec.js
rename to e2e/tests/functional/features/renaming.e2e.spec.js
diff --git a/e2e/tests/functional/search.e2e.spec.js b/e2e/tests/functional/features/search.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/search.e2e.spec.js
rename to e2e/tests/functional/features/search.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/tabs/tabs.e2e.spec.js b/e2e/tests/functional/features/tabs/tabs.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/tabs/tabs.e2e.spec.js
rename to e2e/tests/functional/features/tabs/tabs.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js b/e2e/tests/functional/features/telemetryTable/telemetryTable.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
rename to e2e/tests/functional/features/telemetryTable/telemetryTable.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js b/e2e/tests/functional/features/timeConductor/timeConductor.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
rename to e2e/tests/functional/features/timeConductor/timeConductor.e2e.spec.js
diff --git a/e2e/tests/functional/plugins/timer/timer.e2e.spec.js b/e2e/tests/functional/features/timer/timer.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/plugins/timer/timer.e2e.spec.js
rename to e2e/tests/functional/features/timer/timer.e2e.spec.js
diff --git a/e2e/tests/functional/tooltips.e2e.spec.js b/e2e/tests/functional/features/tooltips.e2e.spec.js
similarity index 99%
rename from e2e/tests/functional/tooltips.e2e.spec.js
rename to e2e/tests/functional/features/tooltips.e2e.spec.js
index 39165f7df5..800af3e718 100644
--- a/e2e/tests/functional/tooltips.e2e.spec.js
+++ b/e2e/tests/functional/features/tooltips.e2e.spec.js
@@ -33,8 +33,8 @@ comfortable running this test during a live mission?" Avoid creating or deleting
 Make no assumptions about the order that elements appear in the DOM.
 */
 
-const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults, expandEntireTree } = require('../../appActions');
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, expandEntireTree } = require('../../../appActions');
 
 test.describe('Verify tooltips', () => {
   let folder1;
diff --git a/e2e/tests/functional/tree.e2e.spec.js b/e2e/tests/functional/features/tree.e2e.spec.js
similarity index 100%
rename from e2e/tests/functional/tree.e2e.spec.js
rename to e2e/tests/functional/features/tree.e2e.spec.js
diff --git a/e2e/tests/performance/tabs.e2e.spec.js b/e2e/tests/performance/features/tabs.e2e.spec.js
similarity index 97%
rename from e2e/tests/performance/tabs.e2e.spec.js
rename to e2e/tests/performance/features/tabs.e2e.spec.js
index 833f2e3669..763d0a3f89 100644
--- a/e2e/tests/performance/tabs.e2e.spec.js
+++ b/e2e/tests/performance/features/tabs.e2e.spec.js
@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { createDomainObjectWithDefaults, waitForPlotsToRender } = require('../../appActions');
-const { test, expect } = require('../../pluginFixtures');
+const { createDomainObjectWithDefaults, waitForPlotsToRender } = require('../../../appActions');
+const { test, expect } = require('../../../pluginFixtures');
 
 test.describe('Tabs View', () => {
   test('Renders tabbed elements nicely', async ({ page }) => {
diff --git a/e2e/tests/performance/tagging.perf.spec.js b/e2e/tests/performance/features/tagging.perf.spec.js
similarity index 100%
rename from e2e/tests/performance/tagging.perf.spec.js
rename to e2e/tests/performance/features/tagging.perf.spec.js
diff --git a/e2e/tests/visual-a11y/controlledClock.visual.spec.js b/e2e/tests/visual-a11y/features/controlledClock.visual.spec.js
similarity index 95%
rename from e2e/tests/visual-a11y/controlledClock.visual.spec.js
rename to e2e/tests/visual-a11y/features/controlledClock.visual.spec.js
index 97acd9fb04..df7963b449 100644
--- a/e2e/tests/visual-a11y/controlledClock.visual.spec.js
+++ b/e2e/tests/visual-a11y/features/controlledClock.visual.spec.js
@@ -25,8 +25,8 @@ Collection of Visual Tests set to run with browser clock manipulate made possibl
 clockOptions plugin fixture.
 */
 
-const { VISUAL_URL, MISSION_TIME } = require('../../constants');
-const { test, expect } = require('../../pluginFixtures');
+const { VISUAL_URL, MISSION_TIME } = require('../../../constants');
+const { test, expect } = require('../../../pluginFixtures');
 const percySnapshot = require('@percy/playwright');
 
 test.describe('Visual - Controlled Clock', () => {
diff --git a/e2e/tests/visual-a11y/defaultPlugins.visual.spec.js b/e2e/tests/visual-a11y/features/defaultPlugins.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/defaultPlugins.visual.spec.js
rename to e2e/tests/visual-a11y/features/defaultPlugins.visual.spec.js
diff --git a/e2e/tests/visual-a11y/displayLayout.visual.spec.js b/e2e/tests/visual-a11y/features/displayLayout.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/displayLayout.visual.spec.js
rename to e2e/tests/visual-a11y/features/displayLayout.visual.spec.js
diff --git a/e2e/tests/visual-a11y/faultManagement.visual.spec.js b/e2e/tests/visual-a11y/features/faultManagement.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/faultManagement.visual.spec.js
rename to e2e/tests/visual-a11y/features/faultManagement.visual.spec.js
diff --git a/e2e/tests/visual-a11y/ladTable.visual.spec.js b/e2e/tests/visual-a11y/features/ladTable.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/ladTable.visual.spec.js
rename to e2e/tests/visual-a11y/features/ladTable.visual.spec.js
diff --git a/e2e/tests/visual-a11y/notebook.visual.spec.js b/e2e/tests/visual-a11y/features/notebook.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/notebook.visual.spec.js
rename to e2e/tests/visual-a11y/features/notebook.visual.spec.js
diff --git a/e2e/tests/visual-a11y/notification.visual.spec.js b/e2e/tests/visual-a11y/features/notification.visual.spec.js
similarity index 95%
rename from e2e/tests/visual-a11y/notification.visual.spec.js
rename to e2e/tests/visual-a11y/features/notification.visual.spec.js
index 2d73fadc59..e71b66369b 100644
--- a/e2e/tests/visual-a11y/notification.visual.spec.js
+++ b/e2e/tests/visual-a11y/features/notification.visual.spec.js
@@ -34,14 +34,14 @@ test.describe("Visual - Check Notification Info Banner of 'Save successful' @a11
     await page.goto(VISUAL_URL, { waitUntil: 'domcontentloaded' });
   });
 
-  test("Create a clock, click on 'Save successful' banner and dismiss it", async ({
+  test("Create a folder, click on 'Save successful' banner and dismiss it", async ({
     page,
     theme
   }) => {
     // Create a clock domain object
     await createDomainObjectWithDefaults(page, {
-      type: 'Clock',
-      name: 'Default Clock'
+      type: 'Folder',
+      name: 'Default Folder'
     });
     // Click on the div with role="alert" that has "Save successful" text
     await page.locator('div[role="alert"]:has-text("Save successful")').click();
diff --git a/e2e/tests/visual-a11y/planning.visual.spec.js b/e2e/tests/visual-a11y/features/planning.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/planning.visual.spec.js
rename to e2e/tests/visual-a11y/features/planning.visual.spec.js
diff --git a/e2e/tests/visual-a11y/search.visual.spec.js b/e2e/tests/visual-a11y/features/search.visual.spec.js
similarity index 100%
rename from e2e/tests/visual-a11y/search.visual.spec.js
rename to e2e/tests/visual-a11y/features/search.visual.spec.js