diff --git a/client/cypress/integration/frontend/instrument-page.spec.js b/client/cypress/integration/frontend/instruments/instrument-page.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/instrument-page.spec.js
rename to client/cypress/integration/frontend/instruments/instrument-page.spec.js
diff --git a/client/cypress/integration/frontend/instruments-page.spec.js b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/instruments-page.spec.js
rename to client/cypress/integration/frontend/instruments/instruments-page.spec.js
diff --git a/client/cypress/integration/frontend/apply-module-visibility.spec.js b/client/cypress/integration/frontend/modules/apply-module-visibility.spec.js
similarity index 95%
rename from client/cypress/integration/frontend/apply-module-visibility.spec.js
rename to client/cypress/integration/frontend/modules/apply-module-visibility.spec.js
index ebbf9cd4..646e3de6 100644
--- a/client/cypress/integration/frontend/apply-module-visibility.spec.js
+++ b/client/cypress/integration/frontend/modules/apply-module-visibility.spec.js
@@ -1,4 +1,4 @@
-import {getModules, getMinimalMe} from '../../support/helpers';
+import {getModules, getMinimalMe} from '../../../support/helpers';
 
 describe('Apply module visibility', () => {
   const schoolClasses = [
diff --git a/client/cypress/integration/frontend/current-module.spec.js b/client/cypress/integration/frontend/modules/current-module.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/current-module.spec.js
rename to client/cypress/integration/frontend/modules/current-module.spec.js
diff --git a/client/cypress/integration/frontend/custom-content-block.spec.js b/client/cypress/integration/frontend/modules/custom-content-block.spec.js
similarity index 91%
rename from client/cypress/integration/frontend/custom-content-block.spec.js
rename to client/cypress/integration/frontend/modules/custom-content-block.spec.js
index 75736e57..0b415197 100644
--- a/client/cypress/integration/frontend/custom-content-block.spec.js
+++ b/client/cypress/integration/frontend/modules/custom-content-block.spec.js
@@ -1,5 +1,5 @@
-import module from '../../fixtures/module.minimal';
-import {getMinimalMe} from '../../support/helpers';
+import module from '../../../fixtures/module.minimal';
+import {getMinimalMe} from '../../../support/helpers';
 
 const chapters = [{
   title: 'ABC',
diff --git a/client/cypress/integration/frontend/snapshots.spec.js b/client/cypress/integration/frontend/modules/snapshots.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/snapshots.spec.js
rename to client/cypress/integration/frontend/modules/snapshots.spec.js
diff --git a/client/cypress/integration/frontend/objectives-visibility.spec.js b/client/cypress/integration/frontend/objectives/objectives-visibility.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/objectives-visibility.spec.js
rename to client/cypress/integration/frontend/objectives/objectives-visibility.spec.js
diff --git a/client/cypress/integration/frontend/objectives.spec.js b/client/cypress/integration/frontend/objectives/objectives.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/objectives.spec.js
rename to client/cypress/integration/frontend/objectives/objectives.spec.js
diff --git a/client/cypress/integration/frontend/home-page.spec.js b/client/cypress/integration/frontend/ui/home-page.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/home-page.spec.js
rename to client/cypress/integration/frontend/ui/home-page.spec.js
diff --git a/client/cypress/integration/frontend/onboarding.spec.js b/client/cypress/integration/frontend/ui/onboarding.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/onboarding.spec.js
rename to client/cypress/integration/frontend/ui/onboarding.spec.js
diff --git a/client/cypress/integration/frontend/sidebar.spec.js b/client/cypress/integration/frontend/ui/sidebar.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/sidebar.spec.js
rename to client/cypress/integration/frontend/ui/sidebar.spec.js
diff --git a/client/cypress/integration/frontend/new-student.spec.js b/client/cypress/integration/frontend/users/new-student.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/new-student.spec.js
rename to client/cypress/integration/frontend/users/new-student.spec.js
diff --git a/client/cypress/integration/frontend/school-class-management.spec.js b/client/cypress/integration/frontend/users/school-class-management.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/school-class-management.spec.js
rename to client/cypress/integration/frontend/users/school-class-management.spec.js
diff --git a/client/cypress/integration/frontend/team.spec.js b/client/cypress/integration/frontend/users/team.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/team.spec.js
rename to client/cypress/integration/frontend/users/team.spec.js