diff --git a/client/ui/frontend/bindings/github.com/netbirdio/netbird/client/ui/services/debug.ts b/client/ui/frontend/bindings/github.com/netbirdio/netbird/client/ui/services/debug.ts
index 578dd20b3..35329dfbf 100644
--- a/client/ui/frontend/bindings/github.com/netbirdio/netbird/client/ui/services/debug.ts
+++ b/client/ui/frontend/bindings/github.com/netbirdio/netbird/client/ui/services/debug.ts
@@ -26,6 +26,15 @@ export function GetLogLevel(): $CancellablePromise<$models.LogLevel> {
     });
 }
 
+/**
+ * RevealFile opens the OS file manager focused on the given path. Wails'
+ * Browser.OpenURL refuses non-http(s) schemes, so the UI calls this binding
+ * instead of constructing a file:// URL.
+ */
+export function RevealFile(path: string): $CancellablePromise<void> {
+    return $Call.ByID(2620662837, path);
+}
+
 export function SetLogLevel(lvl: $models.LogLevel): $CancellablePromise<void> {
     return $Call.ByID(4122411498, lvl);
 }
diff --git a/client/ui/frontend/src/App.tsx b/client/ui/frontend/src/App.tsx
deleted file mode 100644
index 2dcb4464a..000000000
--- a/client/ui/frontend/src/App.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
-import Layout from "./Layout";
-import Status from "./pages/Status";
-import Settings from "./pages/Settings";
-import Networks from "./pages/Networks";
-import Peers from "./pages/Peers";
-import Profiles from "./pages/Profiles";
-import Debug from "./pages/Debug";
-import Update from "./pages/Update";
-import QuickActions from "./pages/QuickActions";
-import LoginUrl from "./pages/LoginUrl";
-import Login from "./pages/Login";
-
-export default function App() {
-  return (
-    <HashRouter>
-      <Routes>
-        <Route path="/quick" element={<QuickActions />} />
-        <Route path="/login" element={<Login />} />
-        <Route path="/login-url" element={<LoginUrl />} />
-        <Route path="/update" element={<Update />} />
-        <Route element={<Layout />}>
-          <Route index element={<Status />} />
-          <Route path="peers" element={<Peers />} />
-          <Route path="networks" element={<Networks />} />
-          <Route path="profiles" element={<Profiles />} />
-          <Route path="settings" element={<Settings />} />
-          <Route path="debug" element={<Debug />} />
-          <Route path="*" element={<Navigate to="/" replace />} />
-        </Route>
-      </Routes>
-    </HashRouter>
-  );
-}
diff --git a/client/ui/frontend/src/app-new.tsx b/client/ui/frontend/src/app-new.tsx
index 783898142..f0e862820 100644
--- a/client/ui/frontend/src/app-new.tsx
+++ b/client/ui/frontend/src/app-new.tsx
@@ -3,7 +3,7 @@ import ReactDOM from "react-dom/client";
 import "./globals.css";
 import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
 import QuickActions from "@/screens/QuickActions.tsx";
-import LoginUrl from "@/screens/LoginUrl.tsx";
+import LoginUrl from "@/pages/LoginUrl.tsx";
 import Update from "@/screens/Update.tsx";
 import { AppLayout } from "@/layouts/AppLayout.tsx";
 import { Main } from "@/layouts/Main.tsx";
diff --git a/client/ui/frontend/src/pages/Debug.tsx b/client/ui/frontend/src/pages/Debug.tsx
index 16d1ff624..bff36c245 100644
--- a/client/ui/frontend/src/pages/Debug.tsx
+++ b/client/ui/frontend/src/pages/Debug.tsx
@@ -1,11 +1,6 @@
 import { useState } from "react";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Debug.tsx
 import { Debug as DebugSvc } from "@bindings/services";
 import type { DebugBundleResult } from "@bindings/services/models.js";
-========
-import { Debug as DebugSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { DebugBundleResult } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Debug.tsx
 import { Button } from "../components/Button";
 import { Input } from "../components/Input";
 import { Switch } from "../components/Switch";
diff --git a/client/ui/frontend/src/screens/Debug.tsx b/client/ui/frontend/src/screens/Debug.tsx
index 16d1ff624..bff36c245 100644
--- a/client/ui/frontend/src/screens/Debug.tsx
+++ b/client/ui/frontend/src/screens/Debug.tsx
@@ -1,11 +1,6 @@
 import { useState } from "react";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Debug.tsx
 import { Debug as DebugSvc } from "@bindings/services";
 import type { DebugBundleResult } from "@bindings/services/models.js";
-========
-import { Debug as DebugSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { DebugBundleResult } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Debug.tsx
 import { Button } from "../components/Button";
 import { Input } from "../components/Input";
 import { Switch } from "../components/Switch";
diff --git a/client/ui/frontend/src/screens/Networks.tsx b/client/ui/frontend/src/screens/Networks.tsx
index 7f65d2efc..5fa7a31cc 100644
--- a/client/ui/frontend/src/screens/Networks.tsx
+++ b/client/ui/frontend/src/screens/Networks.tsx
@@ -1,12 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { RefreshCw } from "lucide-react";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Networks.tsx
 import { Networks as NetworksSvc } from "@bindings/services";
 import type { Network } from "@bindings/services/models.js";
-========
-import { Networks as NetworksSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { Network } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Networks.tsx
 import { Button } from "../components/Button";
 import { Tabs } from "../components/Tabs";
 
diff --git a/client/ui/frontend/src/screens/Peers.tsx b/client/ui/frontend/src/screens/Peers.tsx
index 6944baefe..327b6ac38 100644
--- a/client/ui/frontend/src/screens/Peers.tsx
+++ b/client/ui/frontend/src/screens/Peers.tsx
@@ -1,11 +1,7 @@
 import { useMemo, useState } from "react";
 import { ChevronDown, ChevronRight, Network, ShieldCheck, Zap } from "lucide-react";
 import { useStatus } from "../hooks/useStatus";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Peers.tsx
 import type { PeerStatus } from "@bindings/services/models.js";
-========
-import type { PeerStatus } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Peers.tsx
 import { Card } from "../components/Card";
 import { Input } from "../components/Input";
 import { cn } from "../lib/cn";
diff --git a/client/ui/frontend/src/screens/Profiles.tsx b/client/ui/frontend/src/screens/Profiles.tsx
index 620073499..5c9204480 100644
--- a/client/ui/frontend/src/screens/Profiles.tsx
+++ b/client/ui/frontend/src/screens/Profiles.tsx
@@ -3,13 +3,8 @@ import { Plus, RefreshCw } from "lucide-react";
 import {
   Profiles as ProfilesSvc,
   Connection,
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Profiles.tsx
 } from "@bindings/services";
 import type { Profile } from "@bindings/services/models.js";
-========
-} from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { Profile } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Profiles.tsx
 import { Button } from "../components/Button";
 import { Input } from "../components/Input";
 import { Card } from "../components/Card";
diff --git a/client/ui/frontend/src/screens/QuickActions.tsx b/client/ui/frontend/src/screens/QuickActions.tsx
index 3fae2a077..1f867b154 100644
--- a/client/ui/frontend/src/screens/QuickActions.tsx
+++ b/client/ui/frontend/src/screens/QuickActions.tsx
@@ -1,10 +1,6 @@
 import { CheckCircle2, Circle, Loader2, Power } from "lucide-react";
 import { useStatus } from "../hooks/useStatus";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/QuickActions.tsx
 import { Connection } from "@bindings/services";
-========
-import { Connection } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/QuickActions.tsx
 import { Button } from "../components/Button";
 import { cn } from "../lib/cn";
 
diff --git a/client/ui/frontend/src/screens/Settings.tsx b/client/ui/frontend/src/screens/Settings.tsx
index 1bfd2c8fc..889436af6 100644
--- a/client/ui/frontend/src/screens/Settings.tsx
+++ b/client/ui/frontend/src/screens/Settings.tsx
@@ -2,13 +2,8 @@ import { useCallback, useEffect, useState } from "react";
 import {
   Settings as SettingsSvc,
   Profiles as ProfilesSvc,
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Settings.tsx
 } from "@bindings/services";
 import type { Config } from "@bindings/services/models.js";
-========
-} from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { Config } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Settings.tsx
 import { Button } from "../components/Button";
 import { Input } from "../components/Input";
 import { Switch } from "../components/Switch";
diff --git a/client/ui/frontend/src/screens/Status.tsx b/client/ui/frontend/src/screens/Status.tsx
index f9ddc62d7..4c0352f46 100644
--- a/client/ui/frontend/src/screens/Status.tsx
+++ b/client/ui/frontend/src/screens/Status.tsx
@@ -1,13 +1,8 @@
 import { CheckCircle2, Circle, Loader2, AlertTriangle, Power, LogIn } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { useStatus } from "../hooks/useStatus";
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Status.tsx
 import { Connection } from "@bindings/services";
 import type { SystemEvent } from "@bindings/services/models.js";
-========
-import { Connection } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
-import type { SystemEvent } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Status.tsx
 import { Button } from "../components/Button";
 import { Card } from "../components/Card";
 import { cn } from "../lib/cn";
@@ -29,15 +24,12 @@ export default function Status() {
   // the user has no other way out. Disconnect is the manual unstick path.
   const showLogin = !connected;
 
-<<<<<<<< HEAD:client/ui/frontend/src/screens/Status.tsx
   const toggleState: ConnectionState =
     connected ? ConnectionState.Connected
     : connecting ? ConnectionState.Connecting
     : ConnectionState.Disconnected;
 
-========
   const login = () => navigate("/login");
->>>>>>>> ui-refactor:client/ui/frontend/src/pages/Status.tsx
   const connect = () => Connection.Up({ profileName: "", username: "" }).catch(console.error);
   const disconnect = () => Connection.Down().catch(console.error);
   const toggleConnection = () => (connected ? disconnect() : connect());
diff --git a/client/ui/frontend/tsconfig.json b/client/ui/frontend/tsconfig.json
index 8b9974133..f95ce9015 100644
--- a/client/ui/frontend/tsconfig.json
+++ b/client/ui/frontend/tsconfig.json
@@ -23,7 +23,7 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["src/*"],
-      "@bindings/*": ["bindings/github.com/netbirdio/netbird/client/ui-wails/*"]
+      "@bindings/*": ["bindings/github.com/netbirdio/netbird/client/ui/*"]
     }
   },
   "include": ["src", "bindings"],
diff --git a/client/ui/frontend/vite.config.ts b/client/ui/frontend/vite.config.ts
index 1c6c0733b..179bae646 100644
--- a/client/ui/frontend/vite.config.ts
+++ b/client/ui/frontend/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
       "@bindings": path.resolve(
         __dirname,
-        "./bindings/github.com/netbirdio/netbird/client/ui-wails",
+        "./bindings/github.com/netbirdio/netbird/client/ui",
       ),
     },
   },