diff --git a/apps/login/lib/zitadel.ts b/apps/login/lib/zitadel.ts
index 3fd32877422..b8a9bfad41b 100644
--- a/apps/login/lib/zitadel.ts
+++ b/apps/login/lib/zitadel.ts
@@ -1,4 +1,7 @@
-import { ZitadelOptions, getApps, initializeApp } from "@zitadel/server";
+import { ZitadelOptions } from "@zitadel/server";
+import { getAuth } from "@zitadel/server/auth";
+
+import { getApp, getApps, initializeApp } from "@zitadel/server/app";
 
 export const zitadelConfig: ZitadelOptions = {
   apiUrl: process.env.ZITADEL_API_URL ?? "",
@@ -11,5 +14,10 @@ if (!getApps().length) {
   initializeApp(zitadelConfig);
 }
 
-// const app = getApp();
-// const auth = getAuth();
+const app = getApp();
+
+export async function getMyUser(): Promise<GetMyUserResponse> {
+  const auth = await getAuth();
+  const response = await auth.getMyUser({});
+  return response;
+}
diff --git a/packages/zitadel-server/package.json b/packages/zitadel-server/package.json
index cfdffa2e7c3..6b791e54368 100644
--- a/packages/zitadel-server/package.json
+++ b/packages/zitadel-server/package.json
@@ -10,8 +10,8 @@
     "dist/**"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
-    "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
+    "build": "tsup src/index.ts src/auth/index.ts src/app/index.ts --format esm,cjs --dts",
+    "dev": "tsup src/index.ts src/auth/index.ts src/app/index.ts --format esm,cjs --watch --dts",
     "lint": "eslint \"src/**/*.ts*\"",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
     "prebuild": "pnpm run generate",
diff --git a/packages/zitadel-server/src/admin.ts b/packages/zitadel-server/src/admin/admin.ts
similarity index 78%
rename from packages/zitadel-server/src/admin.ts
rename to packages/zitadel-server/src/admin/admin.ts
index 626a2b64545..b8eae571e19 100644
--- a/packages/zitadel-server/src/admin.ts
+++ b/packages/zitadel-server/src/admin/admin.ts
@@ -1,15 +1,11 @@
 import { CompatServiceDefinition } from "nice-grpc/lib/service-definitions";
 
 import { createChannel, createClientFactory } from "nice-grpc";
-import {
-  AuthServiceClient,
-  AuthServiceDefinition,
-} from "./proto/server/zitadel/auth";
 import {
   AdminServiceClient,
   AdminServiceDefinition,
-} from "./proto/server/zitadel/admin";
-import { authMiddleware } from "./middleware";
+} from "../proto/server/zitadel/admin";
+import { authMiddleware } from "../middleware";
 
 const createClient = <Client>(
   definition: CompatServiceDefinition,
diff --git a/packages/zitadel-server/src/admin/index.ts b/packages/zitadel-server/src/admin/index.ts
new file mode 100644
index 00000000000..2dc46f5235e
--- /dev/null
+++ b/packages/zitadel-server/src/admin/index.ts
@@ -0,0 +1 @@
+export * from "./admin";
diff --git a/packages/zitadel-server/src/app.ts b/packages/zitadel-server/src/app/app.ts
similarity index 100%
rename from packages/zitadel-server/src/app.ts
rename to packages/zitadel-server/src/app/app.ts
diff --git a/packages/zitadel-server/src/app/index.ts b/packages/zitadel-server/src/app/index.ts
new file mode 100644
index 00000000000..ac5307def9e
--- /dev/null
+++ b/packages/zitadel-server/src/app/index.ts
@@ -0,0 +1 @@
+export * from "./app";
diff --git a/packages/zitadel-server/src/auth.ts b/packages/zitadel-server/src/auth/auth.ts
similarity index 68%
rename from packages/zitadel-server/src/auth.ts
rename to packages/zitadel-server/src/auth/auth.ts
index bab2f1cc974..1fe4f97b709 100644
--- a/packages/zitadel-server/src/auth.ts
+++ b/packages/zitadel-server/src/auth/auth.ts
@@ -3,9 +3,10 @@ import { createChannel, createClientFactory } from "nice-grpc";
 import {
   AuthServiceClient,
   AuthServiceDefinition,
-} from "./proto/server/zitadel/auth";
-import { ZitadelApp } from "./app";
-import { authMiddleware } from "./middleware";
+  GetMyUserResponse,
+} from "../proto/server/zitadel/auth";
+import { ZitadelApp } from "../app/app";
+import { authMiddleware } from "../middleware";
 
 const createClient = <Client>(
   definition: CompatServiceDefinition,
@@ -23,3 +24,9 @@ export async function getAuth(app?: ZitadelApp): Promise<AuthServiceClient> {
     ""
   );
 }
+
+export async function getMyUser(): Promise<GetMyUserResponse> {
+  const auth = await getAuth();
+  const response = await auth.getMyUser({});
+  return response;
+}
diff --git a/packages/zitadel-server/src/auth/index.ts b/packages/zitadel-server/src/auth/index.ts
new file mode 100644
index 00000000000..a5dfbee9da0
--- /dev/null
+++ b/packages/zitadel-server/src/auth/index.ts
@@ -0,0 +1,2 @@
+export * from "../proto/server/zitadel/auth";
+export { getAuth } from "./auth";
diff --git a/packages/zitadel-server/src/index.ts b/packages/zitadel-server/src/index.ts
index 2d50c862b8b..3c9daf10c45 100644
--- a/packages/zitadel-server/src/index.ts
+++ b/packages/zitadel-server/src/index.ts
@@ -1,8 +1,11 @@
-export { initializeApp, getApps } from "./app";
+export * from "./app/app";
 
-export { getAuth } from "./auth";
-export { getManagement } from "./management";
-export { getAdmin } from "./admin";
-export { getSystem } from "./system";
+export * as auth from "./auth";
+export * as management from "./management";
+export * as admin from "./admin";
+export * as system from "./system";
 
-export type { ZitadelOptions } from "./app";
+// export * as proto from "./proto/server/zitadel/*";
+// export * from "./proto/server/zitadel/management";
+// export * from "./proto/server/zitadel/system";
+// export * from "./proto/server/zitadel/admin";
diff --git a/packages/zitadel-server/src/management/index.ts b/packages/zitadel-server/src/management/index.ts
new file mode 100644
index 00000000000..af41cea8fe0
--- /dev/null
+++ b/packages/zitadel-server/src/management/index.ts
@@ -0,0 +1 @@
+export * from "./management";
diff --git a/packages/zitadel-server/src/management.ts b/packages/zitadel-server/src/management/management.ts
similarity index 88%
rename from packages/zitadel-server/src/management.ts
rename to packages/zitadel-server/src/management/management.ts
index 0d67c1224ca..615af943d93 100644
--- a/packages/zitadel-server/src/management.ts
+++ b/packages/zitadel-server/src/management/management.ts
@@ -4,10 +4,10 @@ import { createChannel, createClientFactory } from "nice-grpc";
 import {
   ManagementServiceClient,
   ManagementServiceDefinition,
-} from "./proto/server/zitadel/management";
+} from "../proto/server/zitadel/management";
 
-import { authMiddleware } from "./middleware";
-import { ZitadelApp, getApps } from "./app";
+import { authMiddleware } from "../middleware";
+import { ZitadelApp, getApps } from "../app/app";
 
 const createClient = <Client>(
   definition: CompatServiceDefinition,
diff --git a/packages/zitadel-server/src/system/index.ts b/packages/zitadel-server/src/system/index.ts
new file mode 100644
index 00000000000..2217a955246
--- /dev/null
+++ b/packages/zitadel-server/src/system/index.ts
@@ -0,0 +1 @@
+export * from "./system";
diff --git a/packages/zitadel-server/src/system.ts b/packages/zitadel-server/src/system/system.ts
similarity index 92%
rename from packages/zitadel-server/src/system.ts
rename to packages/zitadel-server/src/system/system.ts
index 1a6ab7c58ff..c5b77eac470 100644
--- a/packages/zitadel-server/src/system.ts
+++ b/packages/zitadel-server/src/system/system.ts
@@ -5,8 +5,8 @@ import { createChannel, createClientFactory } from "nice-grpc";
 import {
   SystemServiceClient,
   SystemServiceDefinition,
-} from "./proto/server/zitadel/system";
-import { authMiddleware } from "./middleware";
+} from "../proto/server/zitadel/system";
+import { authMiddleware } from "../middleware";
 
 const createSystemClient = <Client>(
   definition: CompatServiceDefinition,
diff --git a/packages/zitadel-server/tsconfig.json b/packages/zitadel-server/tsconfig.json
index e502a91e183..27bbdb0d91e 100644
--- a/packages/zitadel-server/tsconfig.json
+++ b/packages/zitadel-server/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@zitadel/tsconfig/node14.json",
-  "include": ["."],
+  "include": ["src/**/*"],
   "compilerOptions": {
     "baseUrl": "."
   },