diff --git a/src/components/app/LeaderboardRow.tsx b/src/app/leaderboards/components/LeaderboardRow.tsx
similarity index 100%
rename from src/components/app/LeaderboardRow.tsx
rename to src/app/leaderboards/components/LeaderboardRow.tsx
diff --git a/src/app/leaderboards/page.tsx b/src/app/leaderboards/page.tsx
index 1d9f1ad..dc1aff7 100644
--- a/src/app/leaderboards/page.tsx
+++ b/src/app/leaderboards/page.tsx
@@ -23,7 +23,7 @@ import {
   PaginationPrevious,
 } from "@/components/ui/pagination";
 
-import LeaderboardRow from "@/components/app/LeaderboardRow";
+import LeaderboardRow from "@/app/leaderboards/components/LeaderboardRow";
 
 const globalLeaderboard = [
   {
diff --git a/src/app/runs/components/LiveRunNow.tsx b/src/app/runs/components/LiveRunNow.tsx
new file mode 100644
index 0000000..13e9919
--- /dev/null
+++ b/src/app/runs/components/LiveRunNow.tsx
@@ -0,0 +1,86 @@
+"use client";
+
+import { Eye } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { TableRow, TableCell } from "@/components/ui/table";
+import { cn } from "@/lib/utils";
+
+export default function LiveRunRow({
+  index,
+  username,
+  problem,
+  category,
+  time,
+  pace,
+  status,
+}: any) {
+  const pacePositive = pace.startsWith("+");
+  const isTop = status === "pb";
+
+  return (
+    <TableRow
+      className={cn(
+        "opacity-0 animate-fade-in",
+        isTop ? "bg-primary/5 hover:bg-primary/10" : "hover:bg-secondary/50",
+      )}
+      style={{
+        animationDelay: `${index * 0.05}s`,
+        animationFillMode: "forwards",
+      }}
+    >
+      <TableCell className="font-medium pl-5">
+        {isTop ? `🔥 ${username}` : username}
+      </TableCell>
+
+      <TableCell>
+        <div className="flex flex-col gap-1">
+          <span>{problem}</span>
+          <Badge variant="outline" className="w-fit text-xs">
+            {category}
+          </Badge>
+        </div>
+      </TableCell>
+
+      <TableCell
+        className={`font-mono ${isTop ? "text-primary font-bold" : ""}`}
+      >
+        {time}
+      </TableCell>
+
+      <TableCell>
+        <Badge
+          className={
+            pacePositive
+              ? "bg-red-500/10 text-red-400"
+              : "bg-green-500/10 text-green-400"
+          }
+        >
+          {pace}
+        </Badge>
+      </TableCell>
+
+      <TableCell>
+        <div className="flex items-center gap-2 text-sm">
+          <span
+            className={`h-2 w-2 rounded-full ${
+              status === "pb"
+                ? "bg-green-500"
+                : status === "danger"
+                  ? "bg-red-500"
+                  : "bg-emerald-400"
+            }`}
+          />
+          Live
+        </div>
+      </TableCell>
+
+      <TableCell className="text-right pr-5">
+        <Button size="sm" variant={isTop ? "default" : "ghost"}>
+          <Eye className="h-4 w-4 mr-1" />
+          Watch
+        </Button>
+      </TableCell>
+    </TableRow>
+  );
+}
diff --git a/src/app/runs/components/StatCard.tsx b/src/app/runs/components/StatCard.tsx
new file mode 100644
index 0000000..963e918
--- /dev/null
+++ b/src/app/runs/components/StatCard.tsx
@@ -0,0 +1,21 @@
+import { Card, CardHeader, CardTitle } from "@/components/ui/card";
+
+export default function StatCard({
+  icon: Icon,
+  label,
+  value,
+}: {
+  icon: any;
+  label: string;
+  value: string;
+}) {
+  return (
+    <Card>
+      <CardHeader className="pb-2 text-center">
+        <Icon className="mx-auto h-5 w-5 text-primary" />
+        <CardTitle className="font-mono text-2xl">{value}</CardTitle>
+        <p className="text-xs text-muted-foreground">{label}</p>
+      </CardHeader>
+    </Card>
+  );
+}
diff --git a/src/app/runs/page.tsx b/src/app/runs/page.tsx
index 715bf28..6b91ca2 100644
--- a/src/app/runs/page.tsx
+++ b/src/app/runs/page.tsx
@@ -14,6 +14,8 @@ import {
   TableCell,
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
+import LiveRunRow from "./components/LiveRunNow";
+import StatCard from "./components/StatCard";
 
 /* ---------------- mock data ---------------- */
 
@@ -121,104 +123,3 @@ export default function LiveRuns() {
     </div>
   );
 }
-
-function LiveRunRow({
-  index,
-  username,
-  problem,
-  category,
-  time,
-  pace,
-  status,
-}: any) {
-  const pacePositive = pace.startsWith("+");
-  const isTop = status === "pb";
-
-  return (
-    <TableRow
-      className={cn(
-        "opacity-0 animate-fade-in",
-        isTop ? "bg-primary/5 hover:bg-primary/10" : "hover:bg-secondary/50",
-      )}
-      style={{
-        animationDelay: `${index * 0.05}s`,
-        animationFillMode: "forwards",
-      }}
-    >
-      <TableCell className="font-medium pl-5">
-        {isTop ? `🔥 ${username}` : username}
-      </TableCell>
-
-      <TableCell>
-        <div className="flex flex-col gap-1">
-          <span>{problem}</span>
-          <Badge variant="outline" className="w-fit text-xs">
-            {category}
-          </Badge>
-        </div>
-      </TableCell>
-
-      <TableCell
-        className={`font-mono ${isTop ? "text-primary font-bold" : ""}`}
-      >
-        {time}
-      </TableCell>
-
-      <TableCell>
-        <Badge
-          className={
-            pacePositive
-              ? "bg-red-500/10 text-red-400"
-              : "bg-green-500/10 text-green-400"
-          }
-        >
-          {pace}
-        </Badge>
-      </TableCell>
-
-      <TableCell>
-        <div className="flex items-center gap-2 text-sm">
-          <span
-            className={`h-2 w-2 rounded-full ${
-              status === "pb"
-                ? "bg-green-500"
-                : status === "danger"
-                  ? "bg-red-500"
-                  : "bg-emerald-400"
-            }`}
-          />
-          Live
-        </div>
-      </TableCell>
-
-      <TableCell className="text-right pr-5">
-        <Button size="sm" variant={isTop ? "default" : "ghost"}>
-          <Eye className="h-4 w-4 mr-1" />
-          Watch
-        </Button>
-      </TableCell>
-    </TableRow>
-  );
-}
-
-/* ---------------- helpers ---------------- */
-
-function StatCard({
-  icon: Icon,
-  label,
-  value,
-}: {
-  icon: any;
-  label: string;
-  value: string;
-}) {
-  return (
-    <Card>
-      <CardHeader className="pb-2 text-center">
-        <Icon className="mx-auto h-5 w-5 text-primary" />
-        <CardTitle className="font-mono text-2xl">{value}</CardTitle>
-        <p className="text-xs text-muted-foreground">{label}</p>
-      </CardHeader>
-    </Card>
-  );
-}