diff --git a/.wundergraph/wundergraph.config.ts b/.wundergraph/wundergraph.config.ts
index 09518e4..9b4bc57 100644
--- a/.wundergraph/wundergraph.config.ts
+++ b/.wundergraph/wundergraph.config.ts
@@ -59,7 +59,7 @@ configureWunderGraphApplication({
 		tokenBased: {
 			providers: [
 				{
-					userInfoEndpoint: 'http://localhost:3000/api/wunderauth',
+					userInfoEndpoint: 'http://localhost:3000/jwt/wunderauth',
 				},
 			],
 		},
diff --git a/src/lib/JWT.svelte b/src/lib/JWT.svelte
index 4b3525d..c9f5757 100644
--- a/src/lib/JWT.svelte
+++ b/src/lib/JWT.svelte
@@ -12,6 +12,6 @@
 
 <div class="p-12">
   <button on:click={handleCreateClick} class="btn variant-filled-primary"
-    >Create JWT</button
+    >Wundergraph Login</button
   >
 </div>
diff --git a/src/lib/SignerOLD.svelte b/src/lib/SignerOLD.svelte
deleted file mode 100644
index 2bd6e07..0000000
--- a/src/lib/SignerOLD.svelte
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- SignVerifyMessage.svelte -->
-<script lang="ts">
-  import { ethers } from "ethers";
-  import { onMount } from "svelte";
-  import { signRequest, signedMessages } from "./stores.js";
-
-  let messageToSign = {};
-  let currentPKP;
-  let sessionSigs;
-  let status = "";
-  let litNodeClient;
-  let messageSignature;
-
-  onMount(async () => {
-    litNodeClient = new LitNodeClient({ litNetwork: "serrano" });
-    await litNodeClient.connect();
-
-    const sessionSigsLocalStorage = localStorage.getItem("google-session");
-    const currentPKPLocalStorage = localStorage.getItem("current-pkp");
-    if (sessionSigsLocalStorage && currentPKPLocalStorage) {
-      sessionSigs = JSON.parse(sessionSigsLocalStorage);
-      currentPKP = JSON.parse(currentPKPLocalStorage);
-    }
-  });
-
-  async function signMessageWithPKP() {
-    const userConfirmed = window.confirm(
-      "Do you want to sign the following message?\n\n" +
-        JSON.stringify(messageToSign, null, 2)
-    );
-
-    if (!userConfirmed) {
-      status = "User did not allow to sign the message.";
-      dispatch("status", status);
-      return;
-    }
-    try {
-      // Create a specific JSON object
-      const jsonString = JSON.stringify(messageToSign);
-
-      // Convert the JSON string to an array of character codes
-      const toSign = ethers.getBytes(ethers.hashMessage(jsonString));
-
-      const litActionCode = `
-          const go = async () => {
-            const sigShare = await LitActions.signEcdsa({ toSign, publicKey, sigName });
-          };
-          go();
-        `;
-
-      // Sign message
-      const results = await litNodeClient.executeJs({
-        code: litActionCode,
-        sessionSigs: sessionSigs,
-        jsParams: {
-          toSign: toSign,
-          publicKey: currentPKP.publicKey,
-          sigName: "sig1",
-        },
-      });
-
-      // Get signature
-      const result = results.signatures["sig1"];
-      messageSignature = ethers.Signature.from({
-        r: "0x" + result.r,
-        s: "0x" + result.s,
-        v: result.recid,
-      });
-
-      signedMessages.update((messages) => [
-        ...messages,
-        { json: messageToSign, signature: messageSignature },
-      ]);
-
-      // verify();
-    } catch (err) {
-      console.error(err);
-    }
-  }
-  async function verify() {
-    const response = await fetch("/api/verify", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        messageToSign,
-        messageSignature,
-        currentPKP,
-      }),
-    });
-    if (!response.ok) {
-      alert("verify failed");
-    } else {
-      let json = await response.json();
-      alert(json.verified ? "Signature valid" : "! Signature NOT valid !");
-    }
-  }
-
-  signRequest.subscribe(({ json }) => {
-    if (messageToSign && Object.keys(json).length > 0) {
-      signRequest.set({ json: {} });
-      messageToSign = json;
-      signMessageWithPKP(json);
-    }
-  });
-</script>
-
-{#if status}
-  <div class="mt-4 text-center">
-    <p>Status: {status}</p>
-  </div>
-{/if}
-{#if messageSignature}
-  <div class="mt-4 text-center">
-    <p>Signature</p>
-    <pre>{JSON.stringify(messageSignature)}</pre>
-  </div>
-  <button on:click={verify}>Verify</button><br />
-{/if}
diff --git a/src/lib/User.svelte b/src/lib/User.svelte
deleted file mode 100644
index ae975ee..0000000
--- a/src/lib/User.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script>
-  import { onMount } from "svelte";
-  import Cookies from "js-cookie";
-  let user = null;
-
-  onMount(async () => {
-    const token = Cookies.get("token");
-    const response = await fetch("/api/auth/session", {
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    if (response.ok) {
-      user = await response.json();
-    } else {
-      console.error("Failed to fetch user data");
-    }
-  });
-</script>
-
-{#if user}
-  <p>Welcome, {user.name}!</p>
-  <p>Your roles: {user.roles.join(", ")}</p>
-{:else}
-  <p>Loading...</p>
-{/if}
diff --git a/src/routes/jwt/+page.svelte b/src/routes/jwt/+page.svelte
deleted file mode 100644
index e3371de..0000000
--- a/src/routes/jwt/+page.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-  import AcCs from "$lib/ACCs.svelte";
-  import JWT from "$lib/JWT.svelte";
-</script>
-
-<JWT />
-<!-- <AcCs /> -->
diff --git a/src/routes/api/wunderauth/+server.ts b/src/routes/jwt/wunderauth/+server.ts
similarity index 100%
rename from src/routes/api/wunderauth/+server.ts
rename to src/routes/jwt/wunderauth/+server.ts