diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
index 38ff4e93829..28e88c9e4d8 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
@@ -1,7 +1,7 @@
 "use client";
 
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import type { ResultItem } from "components/engine/system-metrics/components/StatusCodes";
+import type { ResultItem } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/StatusCodes";
 import { THIRDWEB_API_HOST } from "constants/urls";
 import type { EngineBackendWalletType } from "lib/engine";
 import { useState } from "react";
diff --git a/apps/dashboard/src/components/engine/permissions/access-tokens-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/access-tokens-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/add-access-token-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/add-access-token-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/add-keypair-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/add-keypair-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/engine-access-tokens.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/engine-access-tokens.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/keypairs-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/keypairs-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/page.tsx
index 9889e76afc1..51bd7c7cb9d 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineAccessTokens } from "components/engine/permissions/engine-access-tokens";
 import type { EngineInstancePageProps } from "../types";
+import { EngineAccessTokens } from "./components/engine-access-tokens";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/permissions/add-admin-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/add-admin-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/add-admin-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/add-admin-button.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/admins-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/admins-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/admins-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/admins-table.tsx
diff --git a/apps/dashboard/src/components/engine/permissions/engine-admins.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/engine-admins.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/permissions/engine-admins.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/engine-admins.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/page.tsx
index 7abe6bec30e..c7f485e042c 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineAdmins } from "components/engine/permissions/engine-admins";
 import type { EngineInstancePageProps } from "../types";
+import { EngineAdmins } from "./components/engine-admins";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/alerts/EngineAlertDialogForm.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/alerts/EngineAlertDialogForm.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx
diff --git a/apps/dashboard/src/components/engine/alerts/EngineAlertsPage.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/alerts/EngineAlertsPage.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx
diff --git a/apps/dashboard/src/components/engine/alerts/EngineDeleteAlertModal.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/alerts/EngineDeleteAlertModal.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx
diff --git a/apps/dashboard/src/components/engine/alerts/ManageEngineAlerts.stories.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
similarity index 97%
rename from apps/dashboard/src/components/engine/alerts/ManageEngineAlerts.stories.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
index 99fedb29f3d..764d0eb1bfa 100644
--- a/apps/dashboard/src/components/engine/alerts/ManageEngineAlerts.stories.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
@@ -8,8 +8,8 @@ import { Toaster } from "sonner";
 import {
   createEngineAlertRuleStub,
   createEngineNotificationChannelStub,
-} from "../../../stories/stubs";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+} from "stories/stubs";
+import { BadgeContainer, mobileViewport } from "stories/utils";
 import { ManageEngineAlertsSectionUI } from "./ManageEngineAlerts";
 
 const meta = {
diff --git a/apps/dashboard/src/components/engine/alerts/ManageEngineAlerts.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/alerts/ManageEngineAlerts.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx
diff --git a/apps/dashboard/src/components/engine/alerts/RecentEngineAlerts.stories.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
similarity index 94%
rename from apps/dashboard/src/components/engine/alerts/RecentEngineAlerts.stories.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
index e2430ab016d..b3592648b14 100644
--- a/apps/dashboard/src/components/engine/alerts/RecentEngineAlerts.stories.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
@@ -3,8 +3,8 @@ import { Toaster } from "sonner";
 import {
   createEngineAlertRuleStub,
   createEngineAlertStub,
-} from "../../../stories/stubs";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+} from "stories/stubs";
+import { BadgeContainer, mobileViewport } from "stories/utils";
 import { RecentEngineAlertsSectionUI } from "./RecentEngineAlerts";
 
 const meta = {
diff --git a/apps/dashboard/src/components/engine/alerts/RecentEngineAlerts.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/alerts/RecentEngineAlerts.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/page.tsx
index 6e241010fd5..11df86625f4 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineAlertsPage } from "../../../../../../../../components/engine/alerts/EngineAlertsPage";
 import type { EngineInstancePageProps } from "../types";
+import { EngineAlertsPage } from "./components/EngineAlertsPage";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/configuration/cors.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/cors.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/cors.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/cors.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/engine-configuration.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/engine-configuration.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/engine-configuration.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/engine-configuration.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/engine-wallet-config.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/engine-wallet-config.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/ip-allowlist.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/ip-allowlist.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/ip-allowlist.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/ip-allowlist.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/kms-aws-config.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/kms-aws-config.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/kms-aws-config.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/kms-aws-config.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/kms-gcp-config.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/kms-gcp-config.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/local-config.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/local-config.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/local-config.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/local-config.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/system.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/system.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/system.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/system.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/page.tsx
index 5c3853381ce..f4caa750f31 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineConfiguration } from "components/engine/configuration/engine-configuration";
 import type { EngineInstancePageProps } from "../types";
+import { EngineConfiguration } from "./components/engine-configuration";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/contract-subscription/add-contract-subscription-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/contract-subscription/add-contract-subscription-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
diff --git a/apps/dashboard/src/components/engine/contract-subscription/contract-subscriptions-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/contract-subscription/contract-subscriptions-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
diff --git a/apps/dashboard/src/components/engine/contract-subscription/engine-contract-subscription.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/contract-subscription/engine-contract-subscription.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/page.tsx
index eb8ae2b2903..c2f2520383b 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineContractSubscriptions } from "components/engine/contract-subscription/engine-contract-subscription";
 import type { EngineInstancePageProps } from "../types";
+import { EngineContractSubscriptions } from "./components/engine-contract-subscription";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/explorer/engine-explorer.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/engine-explorer.tsx
similarity index 96%
rename from apps/dashboard/src/components/engine/explorer/engine-explorer.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/engine-explorer.tsx
index 8db319a8cdc..4d260a6be9c 100644
--- a/apps/dashboard/src/components/engine/explorer/engine-explorer.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/engine-explorer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { ClientOnly } from "components/ClientOnly/ClientOnly";
-import "../../../css/swagger-ui.css";
+import "./swagger-ui.css";
 import "swagger-ui-react/swagger-ui.css";
 import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
 import dynamic from "next/dynamic";
diff --git a/apps/dashboard/src/css/swagger-ui.css b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/swagger-ui.css
similarity index 95%
rename from apps/dashboard/src/css/swagger-ui.css
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/swagger-ui.css
index d0eeffb6f54..7056aa50e6b 100644
--- a/apps/dashboard/src/css/swagger-ui.css
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/swagger-ui.css
@@ -525,27 +525,27 @@
 
 @-webkit-keyframes rotation {
   to {
-    -webkit-transform: rotate(1turn) !important;
-    transform: rotate(1turn) !important;
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
   }
 }
 
 @keyframes rotation {
   to {
-    -webkit-transform: rotate(1turn) !important;
-    transform: rotate(1turn) !important;
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
   }
 }
 
 @-webkit-keyframes blinker {
   50% {
-    opacity: 0 !important;
+    opacity: 0;
   }
 }
 
 @keyframes blinker {
   50% {
-    opacity: 0 !important;
+    opacity: 0;
   }
 }
 
@@ -603,33 +603,33 @@
 
 @-webkit-keyframes pulse {
   0% {
-    color: #fff !important;
-    background: #4990e2 !important;
-    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0.8) !important;
+    color: #fff;
+    background: #4990e2;
+    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0.8);
   }
   70% {
-    box-shadow: 0 0 0 5px rgba(73, 144, 226, 0) !important;
+    box-shadow: 0 0 0 5px rgba(73, 144, 226, 0);
   }
   to {
-    color: #fff !important;
-    background: #4990e2 !important;
-    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0) !important;
+    color: #fff;
+    background: #4990e2;
+    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0);
   }
 }
 
 @keyframes pulse {
   0% {
-    color: #fff !important;
-    background: #4990e2 !important;
-    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0.8) !important;
+    color: #fff;
+    background: #4990e2;
+    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0.8);
   }
   70% {
-    box-shadow: 0 0 0 5px rgba(73, 144, 226, 0) !important;
+    box-shadow: 0 0 0 5px rgba(73, 144, 226, 0);
   }
   to {
-    color: #fff !important;
-    background: #4990e2 !important;
-    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0) !important;
+    color: #fff;
+    background: #4990e2;
+    box-shadow: 0 0 0 0 rgba(73, 144, 226, 0);
   }
 }
 
@@ -766,48 +766,48 @@
 @-webkit-keyframes shake {
   10%,
   90% {
-    -webkit-transform: translate3d(-1px, 0, 0) !important;
-    transform: translate3d(-1px, 0, 0) !important;
+    -webkit-transform: translate3d(-1px, 0, 0);
+    transform: translate3d(-1px, 0, 0);
   }
   20%,
   80% {
-    -webkit-transform: translate3d(2px, 0, 0) !important;
-    transform: translate3d(2px, 0, 0) !important;
+    -webkit-transform: translate3d(2px, 0, 0);
+    transform: translate3d(2px, 0, 0);
   }
   30%,
   50%,
   70% {
-    -webkit-transform: translate3d(-4px, 0, 0) !important;
-    transform: translate3d(-4px, 0, 0) !important;
+    -webkit-transform: translate3d(-4px, 0, 0);
+    transform: translate3d(-4px, 0, 0);
   }
   40%,
   60% {
-    -webkit-transform: translate3d(4px, 0, 0) !important;
-    transform: translate3d(4px, 0, 0) !important;
+    -webkit-transform: translate3d(4px, 0, 0);
+    transform: translate3d(4px, 0, 0);
   }
 }
 
 @keyframes shake {
   10%,
   90% {
-    -webkit-transform: translate3d(-1px, 0, 0) !important;
-    transform: translate3d(-1px, 0, 0) !important;
+    -webkit-transform: translate3d(-1px, 0, 0);
+    transform: translate3d(-1px, 0, 0);
   }
   20%,
   80% {
-    -webkit-transform: translate3d(2px, 0, 0) !important;
-    transform: translate3d(2px, 0, 0) !important;
+    -webkit-transform: translate3d(2px, 0, 0);
+    transform: translate3d(2px, 0, 0);
   }
   30%,
   50%,
   70% {
-    -webkit-transform: translate3d(-4px, 0, 0) !important;
-    transform: translate3d(-4px, 0, 0) !important;
+    -webkit-transform: translate3d(-4px, 0, 0);
+    transform: translate3d(-4px, 0, 0);
   }
   40%,
   60% {
-    -webkit-transform: translate3d(4px, 0, 0) !important;
-    transform: translate3d(4px, 0, 0) !important;
+    -webkit-transform: translate3d(4px, 0, 0);
+    transform: translate3d(4px, 0, 0);
   }
 }
 
@@ -1521,27 +1521,27 @@
 
 @-webkit-keyframes scaleUp {
   0% {
-    -webkit-transform: scale(0.8) !important;
-    transform: scale(0.8) !important;
-    opacity: 0 !important;
+    -webkit-transform: scale(0.8);
+    transform: scale(0.8);
+    opacity: 0;
   }
   to {
-    -webkit-transform: scale(1) !important;
-    transform: scale(1) !important;
-    opacity: 1 !important;
+    -webkit-transform: scale(1);
+    transform: scale(1);
+    opacity: 1;
   }
 }
 
 @keyframes scaleUp {
   0% {
-    -webkit-transform: scale(0.8) !important;
-    transform: scale(0.8) !important;
-    opacity: 0 !important;
+    -webkit-transform: scale(0.8);
+    transform: scale(0.8);
+    opacity: 0;
   }
   to {
-    -webkit-transform: scale(1) !important;
-    transform: scale(1) !important;
-    opacity: 1 !important;
+    -webkit-transform: scale(1);
+    transform: scale(1);
+    opacity: 1;
   }
 }
 
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/page.tsx
index b4a7648b69d..ca290bf42b9 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineExplorer } from "components/engine/explorer/engine-explorer";
 import type { EngineInstancePageProps } from "../types";
+import { EngineExplorer } from "./components/engine-explorer";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/system-metrics/index.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
similarity index 96%
rename from apps/dashboard/src/components/engine/system-metrics/index.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
index 91559f6309d..77de4c7baa5 100644
--- a/apps/dashboard/src/components/engine/system-metrics/index.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
@@ -9,9 +9,9 @@ import {
 import { Flex } from "@chakra-ui/react";
 import { ChartAreaIcon, InfoIcon } from "lucide-react";
 import { Card, Heading, Text, TrackedLink } from "tw-components";
-import { ErrorRate } from "./components/ErrorRate";
-import { Healthcheck } from "./components/Healthcheck";
-import { StatusCodes } from "./components/StatusCodes";
+import { ErrorRate } from "./ErrorRate";
+import { Healthcheck } from "./Healthcheck";
+import { StatusCodes } from "./StatusCodes";
 
 interface EngineStatusProps {
   instance: EngineInstance;
diff --git a/apps/dashboard/src/components/engine/system-metrics/components/ErrorRate.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/ErrorRate.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/system-metrics/components/ErrorRate.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/ErrorRate.tsx
diff --git a/apps/dashboard/src/components/engine/system-metrics/components/Healthcheck.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/Healthcheck.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/system-metrics/components/Healthcheck.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/Healthcheck.tsx
diff --git a/apps/dashboard/src/components/engine/system-metrics/components/StatusCodes.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/StatusCodes.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/system-metrics/components/StatusCodes.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/StatusCodes.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/page.tsx
index 19156295c52..73e96473ca4 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineSystemMetrics } from "components/engine/system-metrics";
 import type { EngineInstancePageProps } from "../types";
+import { EngineSystemMetrics } from "./components/EngineSystemMetrics";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/relayer/add-relayer-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/relayer/add-relayer-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
diff --git a/apps/dashboard/src/components/engine/relayer/engine-relayer.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/engine-relayer.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/relayer/engine-relayer.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/engine-relayer.tsx
diff --git a/apps/dashboard/src/components/engine/relayer/relayers-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/relayers-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/relayer/relayers-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/relayers-table.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/page.tsx
index fda3c37ae46..f921686be61 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineRelayer } from "components/engine/relayer/engine-relayer";
 import type { EngineInstancePageProps } from "../types";
+import { EngineRelayer } from "./components/engine-relayer";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/components/engine/configuration/add-webhook-button.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/add-webhook-button.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/engine-webhooks.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/engine-webhooks.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx
diff --git a/apps/dashboard/src/components/engine/configuration/webhooks-table.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/webhooks-table.tsx
similarity index 100%
rename from apps/dashboard/src/components/engine/configuration/webhooks-table.tsx
rename to apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/webhooks-table.tsx
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/page.tsx
index 7259f04ddd4..97c5845c08a 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { WithEngineInstance } from "components/engine/EnginePageLayout";
-import { EngineWebhooks } from "components/engine/configuration/engine-webhooks";
 import type { EngineInstancePageProps } from "../types";
+import { EngineWebhooks } from "./components/engine-webhooks";
 
 export default function Page(props: EngineInstancePageProps) {
   const { params } = props;
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/access-tokens.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/access-tokens.tsx
index 68803d4243f..1f32d14b478 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/access-tokens.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/access-tokens.tsx
@@ -1,5 +1,5 @@
+import { EngineAccessTokens } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/access-tokens/components/engine-access-tokens";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineAccessTokens } from "components/engine/permissions/engine-access-tokens";
 
 export default createEnginePage(({ instance }) => (
   <EngineAccessTokens instanceUrl={instance.url} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/admins.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/admins.tsx
index 1747b03b031..6be0e579939 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/admins.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/admins.tsx
@@ -1,5 +1,5 @@
+import { EngineAdmins } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/admins/components/engine-admins";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineAdmins } from "components/engine/permissions/engine-admins";
 
 export default createEnginePage(({ instance }) => (
   <EngineAdmins instanceUrl={instance.url} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/alerts.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/alerts.tsx
index 12d22a617f4..4b4befc12c0 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/alerts.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/alerts.tsx
@@ -1,5 +1,5 @@
+import { EngineAlertsPage } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/alerts/components/EngineAlertsPage";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineAlertsPage } from "../../../../components/engine/alerts/EngineAlertsPage";
 
 export default createEnginePage(({ instance }) => (
   <EngineAlertsPage instance={instance} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/configuration.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/configuration.tsx
index e65efaf796f..50cbdef6c35 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/configuration.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/configuration.tsx
@@ -1,5 +1,5 @@
+import { EngineConfiguration } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/configuration/components/engine-configuration";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineConfiguration } from "components/engine/configuration/engine-configuration";
 
 export default createEnginePage(({ instance }) => (
   <EngineConfiguration instance={instance} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/contract-subscriptions.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/contract-subscriptions.tsx
index a4ed14629fb..cf54686c8ff 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/contract-subscriptions.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/contract-subscriptions.tsx
@@ -1,5 +1,5 @@
+import { EngineContractSubscriptions } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineContractSubscriptions } from "components/engine/contract-subscription/engine-contract-subscription";
 
 export default createEnginePage(({ instance }) => (
   <EngineContractSubscriptions instanceUrl={instance.url} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/explorer.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/explorer.tsx
index e17e8f92201..f33aa3c0381 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/explorer.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/explorer.tsx
@@ -1,5 +1,5 @@
+import { EngineExplorer } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/explorer/components/engine-explorer";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineExplorer } from "components/engine/explorer/engine-explorer";
 
 export default createEnginePage(({ instance }) => (
   <EngineExplorer instanceUrl={instance.url} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/metrics.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/metrics.tsx
index 0bfc96567b3..43fb4c4e2cf 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/metrics.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/metrics.tsx
@@ -1,5 +1,5 @@
+import { EngineSystemMetrics } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/metrics/components/EngineSystemMetrics";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineSystemMetrics } from "components/engine/system-metrics";
 
 export default createEnginePage(({ instance }) => (
   <EngineSystemMetrics instance={instance} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/relayers.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/relayers.tsx
index 84aa1240686..f8b142d6ed6 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/relayers.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/relayers.tsx
@@ -1,5 +1,5 @@
+import { EngineRelayer } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/relayers/components/engine-relayer";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineRelayer } from "components/engine/relayer/engine-relayer";
 
 export default createEnginePage(({ instance }) => (
   <EngineRelayer instanceUrl={instance.url} />
diff --git a/apps/dashboard/src/pages/dashboard/engine/[engineId]/webhooks.tsx b/apps/dashboard/src/pages/dashboard/engine/[engineId]/webhooks.tsx
index e97ed3264b0..9e71a3dd618 100644
--- a/apps/dashboard/src/pages/dashboard/engine/[engineId]/webhooks.tsx
+++ b/apps/dashboard/src/pages/dashboard/engine/[engineId]/webhooks.tsx
@@ -1,5 +1,5 @@
+import { EngineWebhooks } from "app/team/[team_slug]/[project_slug]/engine/(instance)/[engineId]/webhooks/components/engine-webhooks";
 import { createEnginePage } from "components/engine/EnginePage";
-import { EngineWebhooks } from "components/engine/configuration/engine-webhooks";
 
 export default createEnginePage(({ instance }) => (
   <EngineWebhooks instanceUrl={instance.url} />