diff --git a/cypress/e2e/4-create-room/create-room.spec.ts b/cypress/e2e/create-room/create-room.spec.ts
similarity index 100%
rename from cypress/e2e/4-create-room/create-room.spec.ts
rename to cypress/e2e/create-room/create-room.spec.ts
diff --git a/cypress/e2e/7-crypto/crypto.spec.ts b/cypress/e2e/crypto/crypto.spec.ts
similarity index 100%
rename from cypress/e2e/7-crypto/crypto.spec.ts
rename to cypress/e2e/crypto/crypto.spec.ts
diff --git a/cypress/e2e/16-location/location.spec.ts b/cypress/e2e/location/location.spec.ts
similarity index 100%
rename from cypress/e2e/16-location/location.spec.ts
rename to cypress/e2e/location/location.spec.ts
diff --git a/cypress/e2e/2-login/consent.spec.ts b/cypress/e2e/login/consent.spec.ts
similarity index 100%
rename from cypress/e2e/2-login/consent.spec.ts
rename to cypress/e2e/login/consent.spec.ts
diff --git a/cypress/e2e/2-login/login.spec.ts b/cypress/e2e/login/login.spec.ts
similarity index 100%
rename from cypress/e2e/2-login/login.spec.ts
rename to cypress/e2e/login/login.spec.ts
diff --git a/cypress/e2e/15-polls/polls.spec.ts b/cypress/e2e/polls/polls.spec.ts
similarity index 100%
rename from cypress/e2e/15-polls/polls.spec.ts
rename to cypress/e2e/polls/polls.spec.ts
diff --git a/cypress/e2e/1-register/register.spec.ts b/cypress/e2e/register/register.spec.ts
similarity index 100%
rename from cypress/e2e/1-register/register.spec.ts
rename to cypress/e2e/register/register.spec.ts
diff --git a/cypress/e2e/13-regression-tests/pills-click-in-app.spec.ts b/cypress/e2e/regression-tests/pills-click-in-app.spec.ts
similarity index 100%
rename from cypress/e2e/13-regression-tests/pills-click-in-app.spec.ts
rename to cypress/e2e/regression-tests/pills-click-in-app.spec.ts
diff --git a/cypress/e2e/11-room-directory/room-directory.spec.ts b/cypress/e2e/room-directory/room-directory.spec.ts
similarity index 100%
rename from cypress/e2e/11-room-directory/room-directory.spec.ts
rename to cypress/e2e/room-directory/room-directory.spec.ts
diff --git a/cypress/e2e/6-spaces/spaces.spec.ts b/cypress/e2e/spaces/spaces.spec.ts
similarity index 100%
rename from cypress/e2e/6-spaces/spaces.spec.ts
rename to cypress/e2e/spaces/spaces.spec.ts
diff --git a/cypress/e2e/12-spotlight/spotlight.spec.ts b/cypress/e2e/spotlight/spotlight.spec.ts
similarity index 100%
rename from cypress/e2e/12-spotlight/spotlight.spec.ts
rename to cypress/e2e/spotlight/spotlight.spec.ts
diff --git a/cypress/e2e/5-threads/threads.spec.ts b/cypress/e2e/threads/threads.spec.ts
similarity index 100%
rename from cypress/e2e/5-threads/threads.spec.ts
rename to cypress/e2e/threads/threads.spec.ts
diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/timeline/timeline.spec.ts
similarity index 100%
rename from cypress/e2e/14-timeline/timeline.spec.ts
rename to cypress/e2e/timeline/timeline.spec.ts
diff --git a/cypress/e2e/8-update/update.spec.ts b/cypress/e2e/update/update.spec.ts
similarity index 100%
rename from cypress/e2e/8-update/update.spec.ts
rename to cypress/e2e/update/update.spec.ts
diff --git a/cypress/e2e/3-user-menu/user-menu.spec.ts b/cypress/e2e/user-menu/user-menu.spec.ts
similarity index 100%
rename from cypress/e2e/3-user-menu/user-menu.spec.ts
rename to cypress/e2e/user-menu/user-menu.spec.ts
diff --git a/cypress/e2e/10-user-view/user-view.spec.ts b/cypress/e2e/user-view/user-view.spec.ts
similarity index 100%
rename from cypress/e2e/10-user-view/user-view.spec.ts
rename to cypress/e2e/user-view/user-view.spec.ts
diff --git a/cypress/e2e/9-widgets/stickers.spec.ts b/cypress/e2e/widgets/stickers.spec.ts
similarity index 100%
rename from cypress/e2e/9-widgets/stickers.spec.ts
rename to cypress/e2e/widgets/stickers.spec.ts