diff --git a/app/coming-soon/guardrails/page.tsx b/app/(routes)/coming-soon/guardrails/page.tsx
similarity index 100%
rename from app/coming-soon/guardrails/page.tsx
rename to app/(routes)/coming-soon/guardrails/page.tsx
diff --git a/app/coming-soon/model-testing/page.tsx b/app/(routes)/coming-soon/model-testing/page.tsx
similarity index 100%
rename from app/coming-soon/model-testing/page.tsx
rename to app/(routes)/coming-soon/model-testing/page.tsx
diff --git a/app/coming-soon/redteaming/page.tsx b/app/(routes)/coming-soon/redteaming/page.tsx
similarity index 100%
rename from app/coming-soon/redteaming/page.tsx
rename to app/(routes)/coming-soon/redteaming/page.tsx
diff --git a/app/coming-soon/text-to-speech/page.tsx b/app/(routes)/coming-soon/text-to-speech/page.tsx
similarity index 100%
rename from app/coming-soon/text-to-speech/page.tsx
rename to app/(routes)/coming-soon/text-to-speech/page.tsx
diff --git a/app/configurations/page.tsx b/app/(routes)/configurations/page.tsx
similarity index 100%
rename from app/configurations/page.tsx
rename to app/(routes)/configurations/page.tsx
diff --git a/app/configurations/prompt-editor/page.tsx b/app/(routes)/configurations/prompt-editor/page.tsx
similarity index 100%
rename from app/configurations/prompt-editor/page.tsx
rename to app/(routes)/configurations/prompt-editor/page.tsx
diff --git a/app/configurations/prompt-editor/types.ts b/app/(routes)/configurations/prompt-editor/types.ts
similarity index 100%
rename from app/configurations/prompt-editor/types.ts
rename to app/(routes)/configurations/prompt-editor/types.ts
diff --git a/app/configurations/prompt-editor/utils.ts b/app/(routes)/configurations/prompt-editor/utils.ts
similarity index 100%
rename from app/configurations/prompt-editor/utils.ts
rename to app/(routes)/configurations/prompt-editor/utils.ts
diff --git a/app/datasets/page.tsx b/app/(routes)/datasets/page.tsx
similarity index 99%
rename from app/datasets/page.tsx
rename to app/(routes)/datasets/page.tsx
index 7aa8c8f..7ead23b 100644
--- a/app/datasets/page.tsx
+++ b/app/(routes)/datasets/page.tsx
@@ -10,7 +10,7 @@ import { useState, useEffect } from "react";
 
 import { useAuth } from "@/app/lib/context/AuthContext";
 import { useApp } from "@/app/lib/context/AppContext";
-import type { APIKey } from "@/app/keystore/page";
+import { APIKey } from "@/app/lib/types/credentials";
 import Sidebar from "@/app/components/Sidebar";
 import { useToast } from "@/app/components/Toast";
 
diff --git a/app/document/page.tsx b/app/(routes)/document/page.tsx
similarity index 99%
rename from app/document/page.tsx
rename to app/(routes)/document/page.tsx
index 89b2eeb..01ce54f 100644
--- a/app/document/page.tsx
+++ b/app/(routes)/document/page.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect } from "react";
 import { useAuth } from "@/app/lib/context/AuthContext";
 import { useApp } from "@/app/lib/context/AppContext";
-import type { APIKey } from "@/app/keystore/page";
+import { APIKey } from "@/app/lib/types/credentials";
 import Sidebar from "@/app/components/Sidebar";
 import { useToast } from "@/app/components/Toast";
 import { formatDate } from "@/app/components/utils";
diff --git a/app/evaluations/[id]/page.tsx b/app/(routes)/evaluations/[id]/page.tsx
similarity index 100%
rename from app/evaluations/[id]/page.tsx
rename to app/(routes)/evaluations/[id]/page.tsx
diff --git a/app/evaluations/page.tsx b/app/(routes)/evaluations/page.tsx
similarity index 98%
rename from app/evaluations/page.tsx
rename to app/(routes)/evaluations/page.tsx
index 077a900..860ad57 100644
--- a/app/evaluations/page.tsx
+++ b/app/(routes)/evaluations/page.tsx
@@ -10,7 +10,7 @@
 import { useState, useEffect, useCallback, Suspense } from "react";
 import { colors } from "@/app/lib/colors";
 import { useSearchParams } from "next/navigation";
-import { Dataset } from "@/app/datasets/page";
+import { Dataset } from "@/app/(routes)/datasets/page";
 import Sidebar from "@/app/components/Sidebar";
 import TabNavigation from "@/app/components/TabNavigation";
 import { useToast } from "@/app/components/Toast";
@@ -38,6 +38,11 @@ function SimplifiedEvalContent() {
   const { sidebarCollapsed, setSidebarCollapsed } = useApp();
   const { apiKeys } = useAuth();
   const [selectedKeyId, setSelectedKeyId] = useState<string>("");
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
 
   // Dataset creation state
   const [datasetName, setDatasetName] = useState("");
@@ -355,7 +360,7 @@ function SimplifiedEvalContent() {
           />
 
           {/* Tab Content */}
-          {apiKeys.length === 0 ? (
+          {!mounted || apiKeys.length === 0 ? (
             <div
               className="flex-1 flex items-center justify-center"
               style={{ backgroundColor: colors.bg.secondary }}
diff --git a/app/keystore/page.tsx b/app/(routes)/keystore/page.tsx
similarity index 99%
rename from app/keystore/page.tsx
rename to app/(routes)/keystore/page.tsx
index 42d50df..bcdad30 100644
--- a/app/keystore/page.tsx
+++ b/app/(routes)/keystore/page.tsx
@@ -7,17 +7,10 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import Sidebar from "../components/Sidebar";
+import Sidebar from "@/app/components/Sidebar";
 import { useAuth } from "@/app/lib/context/AuthContext";
 import { useApp } from "@/app/lib/context/AppContext";
-
-export interface APIKey {
-  id: string;
-  label: string;
-  key: string;
-  provider: string;
-  createdAt?: string;
-}
+import { APIKey } from "@/app/lib/types/credentials";
 
 export const STORAGE_KEY = "kaapi_api_keys";
 
diff --git a/app/knowledge-base/page.tsx b/app/(routes)/knowledge-base/page.tsx
similarity index 100%
rename from app/knowledge-base/page.tsx
rename to app/(routes)/knowledge-base/page.tsx
diff --git a/app/settings/credentials/page.tsx b/app/(routes)/settings/credentials/page.tsx
similarity index 100%
rename from app/settings/credentials/page.tsx
rename to app/(routes)/settings/credentials/page.tsx
diff --git a/app/speech-to-text/page.tsx b/app/(routes)/speech-to-text/page.tsx
similarity index 99%
rename from app/speech-to-text/page.tsx
rename to app/(routes)/speech-to-text/page.tsx
index db987e6..ecaac94 100644
--- a/app/speech-to-text/page.tsx
+++ b/app/(routes)/speech-to-text/page.tsx
@@ -17,7 +17,7 @@ import { useToast } from "@/app/components/Toast";
 import { useAuth } from "@/app/lib/context/AuthContext";
 import { useApp } from "@/app/lib/context/AppContext";
 import { apiFetch } from "@/app/lib/apiClient";
-import type { APIKey } from "@/app/keystore/page";
+import { APIKey } from "@/app/lib/types/credentials";
 import WaveformVisualizer from "@/app/components/speech-to-text/WaveformVisualizer";
 import { computeWordDiff } from "@/app/components/speech-to-text/TranscriptionDiffViewer";
 import ErrorModal from "@/app/components/ErrorModal";
diff --git a/app/test-evaluation/page.tsx b/app/(routes)/test-evaluation/page.tsx
similarity index 100%
rename from app/test-evaluation/page.tsx
rename to app/(routes)/test-evaluation/page.tsx
diff --git a/app/text-to-speech/page.tsx b/app/(routes)/text-to-speech/page.tsx
similarity index 99%
rename from app/text-to-speech/page.tsx
rename to app/(routes)/text-to-speech/page.tsx
index ead7451..42399f9 100644
--- a/app/text-to-speech/page.tsx
+++ b/app/(routes)/text-to-speech/page.tsx
@@ -17,7 +17,7 @@ import { useToast } from "@/app/components/Toast";
 import { useAuth } from "@/app/lib/context/AuthContext";
 import { useApp } from "@/app/lib/context/AppContext";
 import { apiFetch } from "@/app/lib/apiClient";
-import type { APIKey } from "@/app/keystore/page";
+import { APIKey } from "@/app/lib/types/credentials";
 import ErrorModal from "@/app/components/ErrorModal";
 
 type Tab = "datasets" | "evaluations";
diff --git a/app/components/Loader.tsx b/app/components/Loader.tsx
index 529dcfe..6f99d0c 100644
--- a/app/components/Loader.tsx
+++ b/app/components/Loader.tsx
@@ -3,8 +3,6 @@
  * Matches the design system with smooth animations
  */
 
-import React from "react";
-
 interface LoaderProps {
   size?: "sm" | "md" | "lg";
   message?: string;
diff --git a/app/components/evaluations/DatasetsTab.tsx b/app/components/evaluations/DatasetsTab.tsx
index 5d7674e..feee141 100644
--- a/app/components/evaluations/DatasetsTab.tsx
+++ b/app/components/evaluations/DatasetsTab.tsx
@@ -2,8 +2,8 @@
 
 import { useState, useEffect, useRef } from "react";
 import { colors } from "@/app/lib/colors";
-import { APIKey } from "@/app/keystore/page";
-import { Dataset } from "@/app/datasets/page";
+import { APIKey } from "@/app/lib/types/credentials";
+import { Dataset } from "@/app/(routes)/datasets/page";
 import { useToast } from "@/app/components/Toast";
 import EvalDatasetDescription from "./EvalDatasetDescription";
 
diff --git a/app/components/evaluations/EvaluationsTab.tsx b/app/components/evaluations/EvaluationsTab.tsx
index 68ed5cb..a694bc0 100644
--- a/app/components/evaluations/EvaluationsTab.tsx
+++ b/app/components/evaluations/EvaluationsTab.tsx
@@ -2,13 +2,13 @@
 
 import { useState, useEffect, useCallback } from "react";
 import { colors } from "@/app/lib/colors";
-import { APIKey } from "@/app/keystore/page";
-import { Dataset } from "@/app/datasets/page";
+import { Dataset } from "@/app/(routes)/datasets/page";
 import { EvalJob, AssistantConfig } from "@/app/components/types";
 import ConfigSelector from "@/app/components/ConfigSelector";
 import Loader from "@/app/components/Loader";
 import EvalRunCard from "./EvalRunCard";
 import EvalDatasetDescription from "./EvalDatasetDescription";
+import { APIKey } from "@/app/lib/types/credentials";
 
 type Tab = "datasets" | "evaluations";
 
diff --git a/app/components/prompt-editor/ABTestTab.tsx b/app/components/prompt-editor/ABTestTab.tsx
index a4d3c8e..9d87867 100644
--- a/app/components/prompt-editor/ABTestTab.tsx
+++ b/app/components/prompt-editor/ABTestTab.tsx
@@ -4,7 +4,7 @@ import {
   Commit,
   LegacyVariant,
   TestResult,
-} from "@/app/configurations/prompt-editor/types";
+} from "@/app/(routes)/configurations/prompt-editor/types";
 
 interface ABTestTabProps {
   variants: LegacyVariant[];
diff --git a/app/components/prompt-editor/BranchModal.tsx b/app/components/prompt-editor/BranchModal.tsx
index 9956e9d..c5af63b 100644
--- a/app/components/prompt-editor/BranchModal.tsx
+++ b/app/components/prompt-editor/BranchModal.tsx
@@ -1,5 +1,5 @@
 import { colors } from "@/app/lib/colors";
-import { UnifiedCommit } from "@/app/configurations/prompt-editor/types";
+import { UnifiedCommit } from "@/app/(routes)/configurations/prompt-editor/types";
 
 interface BranchModalProps {
   isOpen: boolean;
diff --git a/app/components/prompt-editor/CommitNode.tsx b/app/components/prompt-editor/CommitNode.tsx
index f61f006..7cc3deb 100644
--- a/app/components/prompt-editor/CommitNode.tsx
+++ b/app/components/prompt-editor/CommitNode.tsx
@@ -1,9 +1,9 @@
 import { colors } from "@/app/lib/colors";
-import { UnifiedCommit } from "@/app/configurations/prompt-editor/types";
+import { UnifiedCommit } from "@/app/(routes)/configurations/prompt-editor/types";
 import {
   getUnifiedBranchColor,
   formatTime,
-} from "@/app/configurations/prompt-editor/utils";
+} from "@/app/(routes)/configurations/prompt-editor/utils";
 
 interface CommitNodeProps {
   commit: UnifiedCommit;
diff --git a/app/components/prompt-editor/ConfigDrawer.tsx b/app/components/prompt-editor/ConfigDrawer.tsx
index c560900..3b21acd 100644
--- a/app/components/prompt-editor/ConfigDrawer.tsx
+++ b/app/components/prompt-editor/ConfigDrawer.tsx
@@ -6,7 +6,7 @@ import {
   Commit,
   LegacyVariant,
   TestResult,
-} from "@/app/configurations/prompt-editor/types";
+} from "@/app/(routes)/configurations/prompt-editor/types";
 import CurrentConfigTab from "./CurrentConfigTab";
 import HistoryTab from "./HistoryTab";
 import ABTestTab from "./ABTestTab";
diff --git a/app/components/prompt-editor/ConfigEditorPane.tsx b/app/components/prompt-editor/ConfigEditorPane.tsx
index 489c0ad..0156147 100644
--- a/app/components/prompt-editor/ConfigEditorPane.tsx
+++ b/app/components/prompt-editor/ConfigEditorPane.tsx
@@ -1,6 +1,9 @@
 import { useState } from "react";
 import { colors } from "@/app/lib/colors";
-import { ConfigBlob, Tool } from "@/app/configurations/prompt-editor/types";
+import {
+  ConfigBlob,
+  Tool,
+} from "@/app/(routes)/configurations/prompt-editor/types";
 import { SavedConfig, ConfigVersionItems } from "@/app/lib/types/configs";
 import { ConfigPublic } from "@/app/lib/configTypes";
 import { formatRelativeTime } from "@/app/lib/utils";
diff --git a/app/components/prompt-editor/CurrentConfigTab.tsx b/app/components/prompt-editor/CurrentConfigTab.tsx
index 3e38384..fa47ae1 100644
--- a/app/components/prompt-editor/CurrentConfigTab.tsx
+++ b/app/components/prompt-editor/CurrentConfigTab.tsx
@@ -1,6 +1,9 @@
 import { useState } from "react";
 import { colors } from "@/app/lib/colors";
-import { Config, Tool } from "@/app/configurations/prompt-editor/types";
+import {
+  Config,
+  Tool,
+} from "@/app/(routes)/configurations/prompt-editor/types";
 
 interface CurrentConfigTabProps {
   configs: Config[];
diff --git a/app/components/prompt-editor/EditorView.tsx b/app/components/prompt-editor/EditorView.tsx
index e650902..fc423c1 100644
--- a/app/components/prompt-editor/EditorView.tsx
+++ b/app/components/prompt-editor/EditorView.tsx
@@ -1,6 +1,6 @@
 import { colors } from "@/app/lib/colors";
-import { Commit } from "@/app/configurations/prompt-editor/types";
-import { getBranchColor } from "@/app/configurations/prompt-editor/utils";
+import { Commit } from "@/app/(routes)/configurations/prompt-editor/types";
+import { getBranchColor } from "@/app/(routes)/configurations/prompt-editor/utils";
 
 interface EditorViewProps {
   currentBranch: string;
diff --git a/app/components/prompt-editor/HistoryTab.tsx b/app/components/prompt-editor/HistoryTab.tsx
index 4472c6f..d58a2c0 100644
--- a/app/components/prompt-editor/HistoryTab.tsx
+++ b/app/components/prompt-editor/HistoryTab.tsx
@@ -1,5 +1,5 @@
 import { colors } from "@/app/lib/colors";
-import { Config } from "@/app/configurations/prompt-editor/types";
+import { Config } from "@/app/(routes)/configurations/prompt-editor/types";
 
 interface HistoryTabProps {
   configs: Config[];
diff --git a/app/components/prompt-editor/MergeModal.tsx b/app/components/prompt-editor/MergeModal.tsx
index a736c6d..7b72d46 100644
--- a/app/components/prompt-editor/MergeModal.tsx
+++ b/app/components/prompt-editor/MergeModal.tsx
@@ -1,9 +1,9 @@
 import { colors } from "@/app/lib/colors";
-import { UnifiedCommit } from "@/app/configurations/prompt-editor/types";
+import { UnifiedCommit } from "@/app/(routes)/configurations/prompt-editor/types";
 import {
   getAllUnifiedBranches,
   getUnifiedBranchColor,
-} from "@/app/configurations/prompt-editor/utils";
+} from "@/app/(routes)/configurations/prompt-editor/utils";
 
 interface MergeModalProps {
   isOpen: boolean;
diff --git a/app/lib/context/AuthContext.tsx b/app/lib/context/AuthContext.tsx
index f7cabc7..8554c73 100644
--- a/app/lib/context/AuthContext.tsx
+++ b/app/lib/context/AuthContext.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { APIKey } from "@/app/keystore/page";
 import {
   createContext,
   useContext,
@@ -8,6 +7,7 @@ import {
   useCallback,
   useEffect,
 } from "react";
+import { APIKey } from "@/app/lib/types/credentials";
 
 const STORAGE_KEY = "kaapi_api_keys";
 
diff --git a/app/lib/types/credentials.ts b/app/lib/types/credentials.ts
index 8a112b7..997b998 100644
--- a/app/lib/types/credentials.ts
+++ b/app/lib/types/credentials.ts
@@ -102,3 +102,11 @@ export const PROVIDERS: ProviderDef[] = [
     ],
   },
 ];
+
+export interface APIKey {
+  id: string;
+  label: string;
+  key: string;
+  provider: string;
+  createdAt?: string;
+}