diff --git a/cypress/e2e/404.cy.ts b/cypress/e2e/404/404.cy.ts
similarity index 100%
rename from cypress/e2e/404.cy.ts
rename to cypress/e2e/404/404.cy.ts
diff --git a/cypress/e2e/cluster/cluster.cy.ts b/cypress/e2e/clusters/cluster.cy.ts
similarity index 99%
rename from cypress/e2e/cluster/cluster.cy.ts
rename to cypress/e2e/clusters/cluster.cy.ts
index e08322e..59a8a27 100644
--- a/cypress/e2e/cluster/cluster.cy.ts
+++ b/cypress/e2e/clusters/cluster.cy.ts
@@ -1,6 +1,6 @@
 import clusters from '../../fixtures/clusters/clusters.json';
-import seedPeers from '../../fixtures/clusters/seed-peers.json';
-import schedulers from '../../fixtures/clusters/schedulers.json';
+import seedPeers from '../../fixtures/seed-peers/seed-peers.json';
+import schedulers from '../../fixtures/schedulers/schedulers.json';
 import cluster from '../../fixtures/clusters/cluster/cluster.json';
 import seedPeer from '../../fixtures/clusters/cluster/seed-peer.json';
 import scheduler from '../../fixtures/clusters/cluster/scheduler.json';
diff --git a/cypress/e2e/clusters.cy.ts b/cypress/e2e/clusters/clusters.cy.ts
similarity index 98%
rename from cypress/e2e/clusters.cy.ts
rename to cypress/e2e/clusters/clusters.cy.ts
index edb8823..c5f9213 100644
--- a/cypress/e2e/clusters.cy.ts
+++ b/cypress/e2e/clusters/clusters.cy.ts
@@ -1,7 +1,7 @@
-import clusters from '../fixtures/clusters/clusters.json';
-import seedPeers from '../fixtures/clusters/seed-peers.json';
-import schedulers from '../fixtures/clusters/schedulers.json';
-import searchCluster from '../fixtures/clusters/search-cluster.json';
+import clusters from '../../fixtures/clusters/clusters.json';
+import seedPeers from '../../fixtures/seed-peers/seed-peers.json';
+import schedulers from '../../fixtures/schedulers/schedulers.json';
+import searchCluster from '../../fixtures/clusters/search-cluster.json';
 
 describe('Clusters', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/create-cluster.cy.ts b/cypress/e2e/clusters/create-cluster.cy.ts
similarity index 97%
rename from cypress/e2e/create-cluster.cy.ts
rename to cypress/e2e/clusters/create-cluster.cy.ts
index 10ae531..60434ca 100644
--- a/cypress/e2e/create-cluster.cy.ts
+++ b/cypress/e2e/clusters/create-cluster.cy.ts
@@ -1,7 +1,7 @@
-import clusters from '../fixtures/clusters/clusters.json';
-import seedPeers from '../fixtures/clusters/seed-peers.json';
-import schedulers from '../fixtures/clusters/schedulers.json';
-import createCluster from '../fixtures/clusters/create-cluster.json';
+import clusters from '../../fixtures/clusters/clusters.json';
+import seedPeers from '../../fixtures/seed-peers/seed-peers.json';
+import schedulers from '../../fixtures/schedulers/schedulers.json';
+import createCluster from '../../fixtures/clusters/create-cluster.json';
 import _ from 'lodash';
 
 describe('Create cluster', () => {
diff --git a/cypress/e2e/update-cluster.cy.ts b/cypress/e2e/clusters/update-cluster.cy.ts
similarity index 98%
rename from cypress/e2e/update-cluster.cy.ts
rename to cypress/e2e/clusters/update-cluster.cy.ts
index a145ea5..f522b29 100644
--- a/cypress/e2e/update-cluster.cy.ts
+++ b/cypress/e2e/clusters/update-cluster.cy.ts
@@ -1,5 +1,5 @@
-import cluster from '../fixtures/clusters/cluster/cluster.json';
-import updateCluster from '../fixtures/clusters/cluster/update-cluster.json';
+import cluster from '../../fixtures/clusters/cluster/cluster.json';
+import updateCluster from '../../fixtures/clusters/cluster/update-cluster.json';
 import _ from 'lodash';
 
 describe('Update cluster', () => {
diff --git a/cypress/e2e/create-token.cy.ts b/cypress/e2e/developer/tokens/create-token.cy.ts
similarity index 98%
rename from cypress/e2e/create-token.cy.ts
rename to cypress/e2e/developer/tokens/create-token.cy.ts
index b6f916f..6026a67 100644
--- a/cypress/e2e/create-token.cy.ts
+++ b/cypress/e2e/developer/tokens/create-token.cy.ts
@@ -1,5 +1,5 @@
-import tokens from '../fixtures/tokens/tokens.json';
-import createToken from '../fixtures/tokens/create-token.json';
+import tokens from '../../../fixtures/developer/tokens/tokens.json';
+import createToken from '../../../fixtures/developer/tokens/create-token.json';
 import _ from 'lodash';
 
 describe('Create token', () => {
diff --git a/cypress/e2e/tokens.cy.ts b/cypress/e2e/developer/tokens/tokens.cy.ts
similarity index 97%
rename from cypress/e2e/tokens.cy.ts
rename to cypress/e2e/developer/tokens/tokens.cy.ts
index 5e0dc07..03d1c39 100644
--- a/cypress/e2e/tokens.cy.ts
+++ b/cypress/e2e/developer/tokens/tokens.cy.ts
@@ -1,6 +1,6 @@
-import tokens from '../fixtures/tokens/tokens.json';
-import deleteToken from '../fixtures/tokens/delete-tokens.json';
-import tokenDeleteAfter from '../fixtures/tokens/token-delete-after.json';
+import tokens from '../../../fixtures/developer/tokens/tokens.json';
+import deleteToken from '../../../fixtures/developer/tokens/delete-tokens.json';
+import tokenDeleteAfter from '../../../fixtures/developer/tokens/token-delete-after.json';
 
 describe('Tokens', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/update-token.cy.ts b/cypress/e2e/developer/tokens/update-token.cy.ts
similarity index 97%
rename from cypress/e2e/update-token.cy.ts
rename to cypress/e2e/developer/tokens/update-token.cy.ts
index bd0be7d..d989081 100644
--- a/cypress/e2e/update-token.cy.ts
+++ b/cypress/e2e/developer/tokens/update-token.cy.ts
@@ -1,6 +1,6 @@
-import tokens from '../fixtures/tokens/tokens.json';
-import token from '../fixtures/tokens/token.json';
-import updateToken from '../fixtures/tokens/update-token.json';
+import tokens from '../../../fixtures/developer/tokens/tokens.json';
+import token from '../../../fixtures/developer/tokens/token.json';
+import updateToken from '../../../fixtures/developer/tokens/update-token.json';
 import _ from 'lodash';
 
 describe('Update token', () => {
diff --git a/cypress/e2e/insight/peers.cy.ts b/cypress/e2e/insight/peers/peers.cy.ts
similarity index 85%
rename from cypress/e2e/insight/peers.cy.ts
rename to cypress/e2e/insight/peers/peers.cy.ts
index d6c70ee..9de537d 100644
--- a/cypress/e2e/insight/peers.cy.ts
+++ b/cypress/e2e/insight/peers/peers.cy.ts
@@ -1,4 +1,4 @@
-import peers from '../../fixtures/peers/peers.json';
+import peers from '../../../fixtures/insight/peers/peers.json';
 
 const path = require('path');
 declare const expect: Chai.ExpectStatic;
@@ -25,23 +25,23 @@ describe('Peers', () => {
 
   describe('when data is loaded', () => {
     it('should display the total number of peers', () => {
-      cy.get(':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(1) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 7);
     });
 
     it('should display the total number of git version', () => {
-      cy.get(':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(2) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 4);
     });
 
     it('should display the total number of git commit', () => {
-      cy.get(':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-1l3zj38 > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        '.css-1l3zj38 > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 5);
     });
 
@@ -218,23 +218,23 @@ describe('Peers', () => {
     });
 
     it('should display the total number of peers', () => {
-      cy.get(':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(1) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
     it('should display the total number of git version', () => {
-      cy.get(':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(2) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
     it('should display the total number of git commit', () => {
-      cy.get(':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-1l3zj38 > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        '.css-1l3zj38 > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
@@ -270,23 +270,23 @@ describe('Peers', () => {
     });
 
     it('should display the total number of peers', () => {
-      cy.get(':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(1) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(1) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
     it('should display the total number of git version', () => {
-      cy.get(':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-18k9q32 > :nth-child(2) > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        ':nth-child(2) > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
     it('should display the total number of git commit', () => {
-      cy.get(':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF').should('exist');
+      cy.get('.css-1l3zj38 > .MuiPaper-root').should('exist');
       cy.get(
-        ':nth-child(3) > .MuiPaper-root > .inde_navigationContent__kHaOF > div.MuiBox-root > .MuiTypography-h5',
+        '.css-1l3zj38 > .MuiPaper-root > .inde_navigationContent__tkUaj > div.MuiBox-root > .MuiTypography-h5',
       ).should('have.text', 0);
     });
 
diff --git a/cypress/e2e/job/create-preheat.cy.ts b/cypress/e2e/job/preheats/create-preheat.cy.ts
similarity index 98%
rename from cypress/e2e/job/create-preheat.cy.ts
rename to cypress/e2e/job/preheats/create-preheat.cy.ts
index db8fcab..4728e35 100644
--- a/cypress/e2e/job/create-preheat.cy.ts
+++ b/cypress/e2e/job/preheats/create-preheat.cy.ts
@@ -1,6 +1,6 @@
-import clusters from '../../fixtures/clusters/clusters.json';
-import preheats from '../../fixtures/preheats/preheats.json';
-import createPreheat from '../../fixtures/preheats/create-preheat.json';
+import clusters from '../../../fixtures/clusters/clusters.json';
+import preheats from '../../../fixtures/job/preheats/preheats.json';
+import createPreheat from '../../../fixtures/job/preheats/create-preheat.json';
 import _ from 'lodash';
 
 describe('Create preheat', () => {
diff --git a/cypress/e2e/job/preheat.cy.ts b/cypress/e2e/job/preheats/preheat.cy.ts
similarity index 97%
rename from cypress/e2e/job/preheat.cy.ts
rename to cypress/e2e/job/preheats/preheat.cy.ts
index 9844dc2..7b0e9d4 100644
--- a/cypress/e2e/job/preheat.cy.ts
+++ b/cypress/e2e/job/preheats/preheat.cy.ts
@@ -1,7 +1,7 @@
-import preheats from '../../fixtures/preheats/preheats.json';
-import failurePreheat from '../../fixtures/preheats/failure-preheat.json';
-import successPreheat from '../../fixtures/preheats/success-preheat.json';
-import pendingPreheat from '../../fixtures/preheats/pending-preheat.json';
+import preheats from '../../../fixtures/job/preheats/preheats.json';
+import failurePreheat from '../../../fixtures/job/preheats/failure-preheat.json';
+import successPreheat from '../../../fixtures/job/preheats/success-preheat.json';
+import pendingPreheat from '../../../fixtures/job/preheats/pending-preheat.json';
 
 declare const expect: Chai.ExpectStatic;
 
diff --git a/cypress/e2e/job/preheats.cy.ts b/cypress/e2e/job/preheats/preheats.cy.ts
similarity index 96%
rename from cypress/e2e/job/preheats.cy.ts
rename to cypress/e2e/job/preheats/preheats.cy.ts
index 186b010..a00f5d2 100644
--- a/cypress/e2e/job/preheats.cy.ts
+++ b/cypress/e2e/job/preheats/preheats.cy.ts
@@ -1,8 +1,8 @@
-import preheats from '../../fixtures/preheats/preheats.json';
-import paginationPreheats from '../../fixtures/preheats/pagination-preheats.json';
-import successPreheats from '../../fixtures/preheats/success-preheats.json';
-import failurePreheats from '../../fixtures/preheats/failure-preheats.json';
-import pendingPreheats from '../../fixtures/preheats/pending-preheats.json';
+import preheats from '../../../fixtures/job/preheats/preheats.json';
+import paginationPreheats from '../../../fixtures/job/preheats/pagination-preheats.json';
+import successPreheats from '../../../fixtures/job/preheats/success-preheats.json';
+import failurePreheats from '../../../fixtures/job/preheats/failure-preheats.json';
+import pendingPreheats from '../../../fixtures/job/preheats/pending-preheats.json';
 
 declare const expect: Chai.ExpectStatic;
 
diff --git a/cypress/e2e/menu.cy.ts b/cypress/e2e/menu/menu.cy.ts
similarity index 100%
rename from cypress/e2e/menu.cy.ts
rename to cypress/e2e/menu/menu.cy.ts
diff --git a/cypress/e2e/profile.cy.ts b/cypress/e2e/profile/profile.cy.ts
similarity index 98%
rename from cypress/e2e/profile.cy.ts
rename to cypress/e2e/profile/profile.cy.ts
index e12f15e..c61878b 100644
--- a/cypress/e2e/profile.cy.ts
+++ b/cypress/e2e/profile/profile.cy.ts
@@ -1,8 +1,4 @@
-import root from '../fixtures/role-root.json';
-import guest from '../fixtures/role-guest.json';
-import user from '../fixtures/user.json';
-import guestUser from '../fixtures/guest-user.json';
-import updateUser from '../fixtures/update-user.json';
+import updateUser from '../../fixtures/users/update-user.json';
 import _ from 'lodash';
 
 describe('Profile', () => {
diff --git a/cypress/e2e/scheduler.cy.ts b/cypress/e2e/schedulers/scheduler.cy.ts
similarity index 96%
rename from cypress/e2e/scheduler.cy.ts
rename to cypress/e2e/schedulers/scheduler.cy.ts
index 64884f6..3075d1a 100644
--- a/cypress/e2e/scheduler.cy.ts
+++ b/cypress/e2e/schedulers/scheduler.cy.ts
@@ -1,7 +1,7 @@
-import cluster from '../fixtures/clusters/cluster/cluster.json';
-import schedulers from '../fixtures/clusters/cluster/scheduler.json';
-import scheduler from '../fixtures/scheduler.json';
-import schedulerInactive from '../fixtures/scheduler-inactive.json';
+import cluster from '../../fixtures/clusters/cluster/cluster.json';
+import schedulers from '../../fixtures/clusters/cluster/scheduler.json';
+import scheduler from '../../fixtures/schedulers/scheduler.json';
+import schedulerInactive from '../../fixtures/schedulers/scheduler-inactive.json';
 
 describe('Scheduler', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/cluster/schedulers.cy.ts b/cypress/e2e/schedulers/schedulers.cy.ts
similarity index 98%
rename from cypress/e2e/cluster/schedulers.cy.ts
rename to cypress/e2e/schedulers/schedulers.cy.ts
index 8284b84..082b642 100644
--- a/cypress/e2e/cluster/schedulers.cy.ts
+++ b/cypress/e2e/schedulers/schedulers.cy.ts
@@ -1,9 +1,9 @@
 import cluster from '../../fixtures/clusters/cluster/cluster.json';
 import seedPeer from '../../fixtures/clusters/cluster/seed-peer.json';
 import scheduler from '../../fixtures/clusters/cluster/scheduler.json';
-import deleteScheduler from '../../fixtures/clusters/cluster/delete-scheduler.json';
-import schedulerDeleteAfter from '../../fixtures/clusters/cluster/scheduler-delete-after.json';
-import searchScheduler from '../../fixtures/clusters/cluster/search-scheduler.json';
+import deleteScheduler from '../../fixtures/schedulers/delete-scheduler.json';
+import schedulerDeleteAfter from '../../fixtures/schedulers/scheduler-delete-after.json';
+import searchScheduler from '../../fixtures/schedulers/search-scheduler.json';
 
 describe('Schedulers', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/seed-peer.cy.ts b/cypress/e2e/seed-peers/seed-peer.cy.ts
similarity index 96%
rename from cypress/e2e/seed-peer.cy.ts
rename to cypress/e2e/seed-peers/seed-peer.cy.ts
index 7ac0159..80c0f1e 100644
--- a/cypress/e2e/seed-peer.cy.ts
+++ b/cypress/e2e/seed-peers/seed-peer.cy.ts
@@ -1,7 +1,7 @@
-import cluster from '../fixtures/clusters/cluster/cluster.json';
-import seedPeers from '../fixtures/clusters/cluster/seed-peer.json';
-import seedPeer from '../fixtures/seed-peer.json';
-import seedPeerInactive from '../fixtures/seed-peer-inactive.json';
+import cluster from '../../fixtures/clusters/cluster/cluster.json';
+import seedPeers from '../../fixtures/clusters/cluster/seed-peer.json';
+import seedPeer from '../../fixtures/seed-peers/seed-peer.json';
+import seedPeerInactive from '../../fixtures/seed-peers/seed-peer-inactive.json';
 
 describe('Seed peer', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/cluster/seed-peers.cy.ts b/cypress/e2e/seed-peers/seed-peers.cy.ts
similarity index 98%
rename from cypress/e2e/cluster/seed-peers.cy.ts
rename to cypress/e2e/seed-peers/seed-peers.cy.ts
index a8aaaf7..a50e062 100644
--- a/cypress/e2e/cluster/seed-peers.cy.ts
+++ b/cypress/e2e/seed-peers/seed-peers.cy.ts
@@ -1,9 +1,9 @@
 import cluster from '../../fixtures/clusters/cluster/cluster.json';
 import seedPeer from '../../fixtures/clusters/cluster/seed-peer.json';
 import scheduler from '../../fixtures/clusters/cluster/scheduler.json';
-import deleteSeedPeer from '../../fixtures/clusters/cluster/delete-seed-peer.json';
-import seedPeerDeleteAfter from '../../fixtures/clusters/cluster/seed-peer-delete-after.json';
-import searchSeedPeer from '../../fixtures/clusters/cluster/search-seed-peer.json';
+import deleteSeedPeer from '../../fixtures/seed-peers/delete-seed-peer.json';
+import seedPeerDeleteAfter from '../../fixtures/seed-peers/seed-peer-delete-after.json';
+import searchSeedPeer from '../../fixtures/seed-peers/search-seed-peer.json';
 
 describe('Seed peers', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/signin.cy.ts b/cypress/e2e/signin/signin.cy.ts
similarity index 99%
rename from cypress/e2e/signin.cy.ts
rename to cypress/e2e/signin/signin.cy.ts
index dc56de1..e278024 100644
--- a/cypress/e2e/signin.cy.ts
+++ b/cypress/e2e/signin/signin.cy.ts
@@ -1,4 +1,4 @@
-import signin from '../fixtures/signin.json';
+import signin from '../../fixtures/signin/signin.json';
 import _ from 'lodash';
 
 describe('Signin', () => {
diff --git a/cypress/e2e/signup.cy.ts b/cypress/e2e/signup/signup.cy.ts
similarity index 99%
rename from cypress/e2e/signup.cy.ts
rename to cypress/e2e/signup/signup.cy.ts
index f500c56..988494c 100644
--- a/cypress/e2e/signup.cy.ts
+++ b/cypress/e2e/signup/signup.cy.ts
@@ -1,4 +1,4 @@
-import signup from '../fixtures/signup.json';
+import signup from '../../fixtures/signup/signup.json';
 import _ from 'lodash';
 
 describe('Signup', () => {
diff --git a/cypress/e2e/users.cy.ts b/cypress/e2e/users/users.cy.ts
similarity index 98%
rename from cypress/e2e/users.cy.ts
rename to cypress/e2e/users/users.cy.ts
index 945c988..3463848 100644
--- a/cypress/e2e/users.cy.ts
+++ b/cypress/e2e/users/users.cy.ts
@@ -1,8 +1,8 @@
-import root from '../fixtures/role-root.json';
-import user from '../fixtures/user.json';
-import users from '../fixtures/users.json';
-import guestUser from '../fixtures/guest-user.json';
-import guest from '../fixtures/role-guest.json';
+import root from '../../fixtures/users/role-root.json';
+import user from '../../fixtures/users/user.json';
+import users from '../../fixtures/users/users.json';
+import guestUser from '../../fixtures/users/guest-user.json';
+import guest from '../../fixtures/users/role-guest.json';
 
 describe('Users', () => {
   beforeEach(() => {
diff --git a/cypress/fixtures/tokens/create-token.json b/cypress/fixtures/developer/tokens/create-token.json
similarity index 100%
rename from cypress/fixtures/tokens/create-token.json
rename to cypress/fixtures/developer/tokens/create-token.json
diff --git a/cypress/fixtures/tokens/delete-tokens.json b/cypress/fixtures/developer/tokens/delete-tokens.json
similarity index 100%
rename from cypress/fixtures/tokens/delete-tokens.json
rename to cypress/fixtures/developer/tokens/delete-tokens.json
diff --git a/cypress/fixtures/tokens/token-delete-after.json b/cypress/fixtures/developer/tokens/token-delete-after.json
similarity index 100%
rename from cypress/fixtures/tokens/token-delete-after.json
rename to cypress/fixtures/developer/tokens/token-delete-after.json
diff --git a/cypress/fixtures/tokens/token.json b/cypress/fixtures/developer/tokens/token.json
similarity index 100%
rename from cypress/fixtures/tokens/token.json
rename to cypress/fixtures/developer/tokens/token.json
diff --git a/cypress/fixtures/tokens/tokens.json b/cypress/fixtures/developer/tokens/tokens.json
similarity index 100%
rename from cypress/fixtures/tokens/tokens.json
rename to cypress/fixtures/developer/tokens/tokens.json
diff --git a/cypress/fixtures/tokens/update-token.json b/cypress/fixtures/developer/tokens/update-token.json
similarity index 100%
rename from cypress/fixtures/tokens/update-token.json
rename to cypress/fixtures/developer/tokens/update-token.json
diff --git a/cypress/fixtures/peers/peers.json b/cypress/fixtures/insight/peers/peers.json
similarity index 100%
rename from cypress/fixtures/peers/peers.json
rename to cypress/fixtures/insight/peers/peers.json
diff --git a/cypress/fixtures/preheats/create-preheat.json b/cypress/fixtures/job/preheats/create-preheat.json
similarity index 100%
rename from cypress/fixtures/preheats/create-preheat.json
rename to cypress/fixtures/job/preheats/create-preheat.json
diff --git a/cypress/fixtures/preheats/failure-preheat.json b/cypress/fixtures/job/preheats/failure-preheat.json
similarity index 100%
rename from cypress/fixtures/preheats/failure-preheat.json
rename to cypress/fixtures/job/preheats/failure-preheat.json
diff --git a/cypress/fixtures/preheats/failure-preheats.json b/cypress/fixtures/job/preheats/failure-preheats.json
similarity index 100%
rename from cypress/fixtures/preheats/failure-preheats.json
rename to cypress/fixtures/job/preheats/failure-preheats.json
diff --git a/cypress/fixtures/preheats/pagination-preheats.json b/cypress/fixtures/job/preheats/pagination-preheats.json
similarity index 100%
rename from cypress/fixtures/preheats/pagination-preheats.json
rename to cypress/fixtures/job/preheats/pagination-preheats.json
diff --git a/cypress/fixtures/preheats/pending-preheat.json b/cypress/fixtures/job/preheats/pending-preheat.json
similarity index 100%
rename from cypress/fixtures/preheats/pending-preheat.json
rename to cypress/fixtures/job/preheats/pending-preheat.json
diff --git a/cypress/fixtures/preheats/pending-preheats.json b/cypress/fixtures/job/preheats/pending-preheats.json
similarity index 100%
rename from cypress/fixtures/preheats/pending-preheats.json
rename to cypress/fixtures/job/preheats/pending-preheats.json
diff --git a/cypress/fixtures/preheats/preheats.json b/cypress/fixtures/job/preheats/preheats.json
similarity index 100%
rename from cypress/fixtures/preheats/preheats.json
rename to cypress/fixtures/job/preheats/preheats.json
diff --git a/cypress/fixtures/preheats/success-preheat.json b/cypress/fixtures/job/preheats/success-preheat.json
similarity index 100%
rename from cypress/fixtures/preheats/success-preheat.json
rename to cypress/fixtures/job/preheats/success-preheat.json
diff --git a/cypress/fixtures/preheats/success-preheats.json b/cypress/fixtures/job/preheats/success-preheats.json
similarity index 100%
rename from cypress/fixtures/preheats/success-preheats.json
rename to cypress/fixtures/job/preheats/success-preheats.json
diff --git a/cypress/fixtures/clusters/cluster/delete-scheduler.json b/cypress/fixtures/schedulers/delete-scheduler.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/delete-scheduler.json
rename to cypress/fixtures/schedulers/delete-scheduler.json
diff --git a/cypress/fixtures/clusters/cluster/scheduler-delete-after.json b/cypress/fixtures/schedulers/scheduler-delete-after.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/scheduler-delete-after.json
rename to cypress/fixtures/schedulers/scheduler-delete-after.json
diff --git a/cypress/fixtures/scheduler-inactive.json b/cypress/fixtures/schedulers/scheduler-inactive.json
similarity index 100%
rename from cypress/fixtures/scheduler-inactive.json
rename to cypress/fixtures/schedulers/scheduler-inactive.json
diff --git a/cypress/fixtures/scheduler.json b/cypress/fixtures/schedulers/scheduler.json
similarity index 100%
rename from cypress/fixtures/scheduler.json
rename to cypress/fixtures/schedulers/scheduler.json
diff --git a/cypress/fixtures/clusters/schedulers.json b/cypress/fixtures/schedulers/schedulers.json
similarity index 100%
rename from cypress/fixtures/clusters/schedulers.json
rename to cypress/fixtures/schedulers/schedulers.json
diff --git a/cypress/fixtures/clusters/cluster/search-scheduler.json b/cypress/fixtures/schedulers/search-scheduler.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/search-scheduler.json
rename to cypress/fixtures/schedulers/search-scheduler.json
diff --git a/cypress/fixtures/clusters/cluster/delete-seed-peer.json b/cypress/fixtures/seed-peers/delete-seed-peer.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/delete-seed-peer.json
rename to cypress/fixtures/seed-peers/delete-seed-peer.json
diff --git a/cypress/fixtures/clusters/cluster/search-seed-peer.json b/cypress/fixtures/seed-peers/search-seed-peer.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/search-seed-peer.json
rename to cypress/fixtures/seed-peers/search-seed-peer.json
diff --git a/cypress/fixtures/clusters/cluster/seed-peer-delete-after.json b/cypress/fixtures/seed-peers/seed-peer-delete-after.json
similarity index 100%
rename from cypress/fixtures/clusters/cluster/seed-peer-delete-after.json
rename to cypress/fixtures/seed-peers/seed-peer-delete-after.json
diff --git a/cypress/fixtures/seed-peer-inactive.json b/cypress/fixtures/seed-peers/seed-peer-inactive.json
similarity index 100%
rename from cypress/fixtures/seed-peer-inactive.json
rename to cypress/fixtures/seed-peers/seed-peer-inactive.json
diff --git a/cypress/fixtures/seed-peer.json b/cypress/fixtures/seed-peers/seed-peer.json
similarity index 100%
rename from cypress/fixtures/seed-peer.json
rename to cypress/fixtures/seed-peers/seed-peer.json
diff --git a/cypress/fixtures/clusters/seed-peers.json b/cypress/fixtures/seed-peers/seed-peers.json
similarity index 100%
rename from cypress/fixtures/clusters/seed-peers.json
rename to cypress/fixtures/seed-peers/seed-peers.json
diff --git a/cypress/fixtures/signin.json b/cypress/fixtures/signin/signin.json
similarity index 100%
rename from cypress/fixtures/signin.json
rename to cypress/fixtures/signin/signin.json
diff --git a/cypress/fixtures/signup.json b/cypress/fixtures/signup/signup.json
similarity index 100%
rename from cypress/fixtures/signup.json
rename to cypress/fixtures/signup/signup.json
diff --git a/cypress/fixtures/guest-user.json b/cypress/fixtures/users/guest-user.json
similarity index 100%
rename from cypress/fixtures/guest-user.json
rename to cypress/fixtures/users/guest-user.json
diff --git a/cypress/fixtures/role-guest.json b/cypress/fixtures/users/role-guest.json
similarity index 100%
rename from cypress/fixtures/role-guest.json
rename to cypress/fixtures/users/role-guest.json
diff --git a/cypress/fixtures/role-root.json b/cypress/fixtures/users/role-root.json
similarity index 100%
rename from cypress/fixtures/role-root.json
rename to cypress/fixtures/users/role-root.json
diff --git a/cypress/fixtures/update-user.json b/cypress/fixtures/users/update-user.json
similarity index 100%
rename from cypress/fixtures/update-user.json
rename to cypress/fixtures/users/update-user.json
diff --git a/cypress/fixtures/user.json b/cypress/fixtures/users/user.json
similarity index 100%
rename from cypress/fixtures/user.json
rename to cypress/fixtures/users/user.json
diff --git a/cypress/fixtures/users.json b/cypress/fixtures/users/users.json
similarity index 100%
rename from cypress/fixtures/users.json
rename to cypress/fixtures/users/users.json
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index b02612d..4cd64a4 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -15,14 +15,14 @@ Cypress.Commands.add('signin', () => {
       method: 'GET',
       url: '/api/v1/users/1',
     },
-    { fixture: 'user.json' },
+    { fixture: 'users/user.json' },
   );
   cy.intercept(
     {
       method: 'GET',
       url: '/api/v1/users/1/roles',
     },
-    { fixture: 'role-root.json' },
+    { fixture: 'users/role-root.json' },
   );
 });
 
@@ -36,13 +36,13 @@ Cypress.Commands.add('guestSignin', () => {
       method: 'GET',
       url: '/api/v1/users/2',
     },
-    { fixture: 'guest-user.json' },
+    { fixture: 'users/guest-user.json' },
   );
   cy.intercept(
     {
       method: 'GET',
       url: '/api/v1/users/2/roles',
     },
-    { fixture: 'role-guest.json' },
+    { fixture: 'users/role-guest.json' },
   );
 });
diff --git a/src/App.css b/src/App.css
deleted file mode 100644
index 74b5e05..0000000
--- a/src/App.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/src/App.test.tsx b/src/App.test.tsx
deleted file mode 100644
index 1f03afe..0000000
--- a/src/App.test.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});
diff --git a/src/components/insight/peer/inde.module.css b/src/components/insight/peers/inde.module.css
similarity index 100%
rename from src/components/insight/peer/inde.module.css
rename to src/components/insight/peers/inde.module.css
diff --git a/src/components/insight/peer/index.tsx b/src/components/insight/peers/index.tsx
similarity index 99%
rename from src/components/insight/peer/index.tsx
rename to src/components/insight/peers/index.tsx
index e5494ed..7def832 100644
--- a/src/components/insight/peer/index.tsx
+++ b/src/components/insight/peers/index.tsx
@@ -337,11 +337,10 @@ export default function Peer() {
     datasets: [
       {
         data: cluster.map((item) => item.count),
-        backgroundColor: 'rgba(46,143,121,0.6)',
+        backgroundColor: 'rgb(46,143,121)',
         borderColor: 'rgb(46,143,121)',
         borderWidth: 1,
         borderRadius: 5,
-        hoverBackgroundColor: 'rgb(46,143,121)',
         barPercentage: 0.6,
       },
     ],
@@ -377,11 +376,10 @@ export default function Peer() {
     datasets: [
       {
         data: gitVersion.map((item) => item.count),
-        backgroundColor: 'rgba(46,143,121,0.6)',
+        backgroundColor: 'rgb(46,143,121)',
         borderColor: 'rgb(46,143,121)',
         borderWidth: 1,
         borderRadius: 5,
-        hoverBackgroundColor: 'rgb(46,143,121)',
         barPercentage: 0.6,
       },
     ],
@@ -410,11 +408,10 @@ export default function Peer() {
     datasets: [
       {
         data: gitCommit.map((item) => item.count),
-        backgroundColor: 'rgba(46,143,121,0.6)',
+        backgroundColor: 'rgb(46,143,121)',
         borderColor: 'rgb(46,143,121)',
         borderWidth: 1,
         borderRadius: 5,
-        hoverBackgroundColor: 'rgb(46,143,121)',
         barPercentage: 0.6,
       },
     ],
diff --git a/src/index.tsx b/src/index.tsx
index 99fd4fc..89022ac 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
-import reportWebVitals from './reportWebVitals';
 import { BrowserRouter as Routers } from 'react-router-dom';
 import { ThemeProvider, createTheme } from '@mui/material/styles';
+
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
 
 const theme = createTheme({
@@ -22,5 +22,3 @@ root.render(
     </ThemeProvider>
   </React.StrictMode>,
 );
-
-reportWebVitals();
diff --git a/src/layouts/main.tsx b/src/layouts/main.tsx
index 37a0700..22f575e 100644
--- a/src/layouts/main.tsx
+++ b/src/layouts/main.tsx
@@ -17,7 +17,7 @@ import EditTokens from '../components/developer/tokens/edit';
 import Preheats from '../components/job/preheats';
 import NewPreheat from '../components/job/preheats/new';
 import ShowPreheat from '../components/job/preheats/show';
-import Peers from '../components/insight/peer';
+import Peers from '../components/insight/peers';
 import { useState, useEffect } from 'react';
 import { getJwtPayload } from '../lib/utils';
 import { getUserRoles } from '../lib/api';
diff --git a/src/reportWebVitals.ts b/src/reportWebVitals.ts
deleted file mode 100644
index 49a2a16..0000000
--- a/src/reportWebVitals.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
diff --git a/src/setupTests.ts b/src/setupTests.ts
deleted file mode 100644
index 8f2609b..0000000
--- a/src/setupTests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';