diff --git a/.gitignore b/.gitignore
index dd694bdeb5..cd0926ae53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 
 # Test binary, build with `go test -c`
 *.test
+!.env.test
 
 # Coverage
 coverage.txt
@@ -68,6 +69,7 @@ docs/docs/apis/proto
 /internal/api/ui/login/static/resources/themes/zitadel/css/zitadel.css
 /internal/api/ui/login/static/resources/themes/zitadel/css/zitadel.css.map
 zitadel-*-*
+!login/**/zitadel-*-*
 
 # local
 build/local/*.env
diff --git a/acceptance/.eslintrc.cjs b/acceptance/.eslintrc.cjs
new file mode 100644
index 0000000000..7009e6fbfe
--- /dev/null
+++ b/acceptance/.eslintrc.cjs
@@ -0,0 +1,5 @@
+module.exports = {
+  root: true,
+  // Use basic ESLint config since the login app has its own detailed config
+  extends: ["eslint:recommended"],
+};
diff --git a/login/apps/login-test-acceptance/.gitignore b/acceptance/.gitignore
similarity index 100%
rename from login/apps/login-test-acceptance/.gitignore
rename to acceptance/.gitignore
diff --git a/login/apps/login-test-acceptance/docker-compose-ci.yaml b/acceptance/docker-compose-ci.yaml
similarity index 100%
rename from login/apps/login-test-acceptance/docker-compose-ci.yaml
rename to acceptance/docker-compose-ci.yaml
diff --git a/login/apps/login-test-acceptance/docker-compose.yaml b/acceptance/docker-compose.yaml
similarity index 100%
rename from login/apps/login-test-acceptance/docker-compose.yaml
rename to acceptance/docker-compose.yaml
diff --git a/login/apps/login-test-acceptance/go-command.Dockerfile b/acceptance/go-command.Dockerfile
similarity index 100%
rename from login/apps/login-test-acceptance/go-command.Dockerfile
rename to acceptance/go-command.Dockerfile
diff --git a/login/apps/login-test-acceptance/idp/oidc/go.mod b/acceptance/idp/oidc/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/idp/oidc/go.mod
rename to acceptance/idp/oidc/go.mod
diff --git a/login/apps/login-test-acceptance/idp/oidc/go.sum b/acceptance/idp/oidc/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/idp/oidc/go.sum
rename to acceptance/idp/oidc/go.sum
diff --git a/login/apps/login-test-acceptance/idp/oidc/main.go b/acceptance/idp/oidc/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/idp/oidc/main.go
rename to acceptance/idp/oidc/main.go
diff --git a/login/apps/login-test-acceptance/idp/saml/go.mod b/acceptance/idp/saml/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/idp/saml/go.mod
rename to acceptance/idp/saml/go.mod
diff --git a/login/apps/login-test-acceptance/idp/saml/go.sum b/acceptance/idp/saml/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/idp/saml/go.sum
rename to acceptance/idp/saml/go.sum
diff --git a/login/apps/login-test-acceptance/idp/saml/main.go b/acceptance/idp/saml/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/idp/saml/main.go
rename to acceptance/idp/saml/main.go
diff --git a/login/apps/login-test-acceptance/oidcrp/go.mod b/acceptance/oidcrp/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/oidcrp/go.mod
rename to acceptance/oidcrp/go.mod
diff --git a/login/apps/login-test-acceptance/oidcrp/go.sum b/acceptance/oidcrp/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/oidcrp/go.sum
rename to acceptance/oidcrp/go.sum
diff --git a/login/apps/login-test-acceptance/oidcrp/main.go b/acceptance/oidcrp/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/oidcrp/main.go
rename to acceptance/oidcrp/main.go
diff --git a/login/apps/login-test-acceptance/package.json b/acceptance/package.json
similarity index 100%
rename from login/apps/login-test-acceptance/package.json
rename to acceptance/package.json
diff --git a/login/apps/login-test-acceptance/pat/.gitignore b/acceptance/pat/.gitignore
similarity index 50%
rename from login/apps/login-test-acceptance/pat/.gitignore
rename to acceptance/pat/.gitignore
index 377ccd3fdf..bf27f3114d 100644
--- a/login/apps/login-test-acceptance/pat/.gitignore
+++ b/acceptance/pat/.gitignore
@@ -1,2 +1,3 @@
 *
+!.gitignore
 !.gitkeep
diff --git a/login/apps/login-test-acceptance/pat/.gitkeep b/acceptance/pat/.gitkeep
similarity index 100%
rename from login/apps/login-test-acceptance/pat/.gitkeep
rename to acceptance/pat/.gitkeep
diff --git a/login/apps/login-test-acceptance/playwright-report/.gitignore b/acceptance/playwright-report/.gitignore
similarity index 50%
rename from login/apps/login-test-acceptance/playwright-report/.gitignore
rename to acceptance/playwright-report/.gitignore
index 377ccd3fdf..bf27f3114d 100644
--- a/login/apps/login-test-acceptance/playwright-report/.gitignore
+++ b/acceptance/playwright-report/.gitignore
@@ -1,2 +1,3 @@
 *
+!.gitignore
 !.gitkeep
diff --git a/login/apps/login-test-acceptance/playwright-report/.gitkeep b/acceptance/playwright-report/.gitkeep
similarity index 100%
rename from login/apps/login-test-acceptance/playwright-report/.gitkeep
rename to acceptance/playwright-report/.gitkeep
diff --git a/login/apps/login-test-acceptance/playwright.config.ts b/acceptance/playwright.config.ts
similarity index 100%
rename from login/apps/login-test-acceptance/playwright.config.ts
rename to acceptance/playwright.config.ts
diff --git a/login/apps/login-test-acceptance/samlsp/go.mod b/acceptance/samlsp/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/samlsp/go.mod
rename to acceptance/samlsp/go.mod
diff --git a/login/apps/login-test-acceptance/samlsp/go.sum b/acceptance/samlsp/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/samlsp/go.sum
rename to acceptance/samlsp/go.sum
diff --git a/login/apps/login-test-acceptance/samlsp/main.go b/acceptance/samlsp/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/samlsp/main.go
rename to acceptance/samlsp/main.go
diff --git a/login/apps/login-test-acceptance/setup/go.mod b/acceptance/setup/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/setup/go.mod
rename to acceptance/setup/go.mod
diff --git a/login/apps/login-test-acceptance/setup/go.sum b/acceptance/setup/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/setup/go.sum
rename to acceptance/setup/go.sum
diff --git a/login/apps/login-test-acceptance/setup/main.go b/acceptance/setup/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/setup/main.go
rename to acceptance/setup/main.go
diff --git a/login/apps/login-test-acceptance/setup/setup.sh b/acceptance/setup/setup.sh
similarity index 100%
rename from login/apps/login-test-acceptance/setup/setup.sh
rename to acceptance/setup/setup.sh
diff --git a/login/apps/login-test-acceptance/sink/go.mod b/acceptance/sink/go.mod
similarity index 100%
rename from login/apps/login-test-acceptance/sink/go.mod
rename to acceptance/sink/go.mod
diff --git a/login/apps/login-test-acceptance/sink/go.sum b/acceptance/sink/go.sum
similarity index 100%
rename from login/apps/login-test-acceptance/sink/go.sum
rename to acceptance/sink/go.sum
diff --git a/login/apps/login-test-acceptance/sink/main.go b/acceptance/sink/main.go
similarity index 100%
rename from login/apps/login-test-acceptance/sink/main.go
rename to acceptance/sink/main.go
diff --git a/login/apps/login-test-acceptance/test-results/.gitignore b/acceptance/test-results/.gitignore
similarity index 50%
rename from login/apps/login-test-acceptance/test-results/.gitignore
rename to acceptance/test-results/.gitignore
index 377ccd3fdf..bf27f3114d 100644
--- a/login/apps/login-test-acceptance/test-results/.gitignore
+++ b/acceptance/test-results/.gitignore
@@ -1,2 +1,3 @@
 *
+!.gitignore
 !.gitkeep
diff --git a/login/apps/login-test-acceptance/test-results/.gitkeep b/acceptance/test-results/.gitkeep
similarity index 100%
rename from login/apps/login-test-acceptance/test-results/.gitkeep
rename to acceptance/test-results/.gitkeep
diff --git a/login/apps/login-test-acceptance/tests/admin.spec.ts b/acceptance/tests/admin.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/admin.spec.ts
rename to acceptance/tests/admin.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/code-screen.ts b/acceptance/tests/code-screen.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/code-screen.ts
rename to acceptance/tests/code-screen.ts
diff --git a/login/apps/login-test-acceptance/tests/code.ts b/acceptance/tests/code.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/code.ts
rename to acceptance/tests/code.ts
diff --git a/login/apps/login-test-acceptance/tests/email-verify-screen.ts b/acceptance/tests/email-verify-screen.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/email-verify-screen.ts
rename to acceptance/tests/email-verify-screen.ts
diff --git a/login/apps/login-test-acceptance/tests/email-verify.spec.ts b/acceptance/tests/email-verify.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/email-verify.spec.ts
rename to acceptance/tests/email-verify.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/email-verify.ts b/acceptance/tests/email-verify.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/email-verify.ts
rename to acceptance/tests/email-verify.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-apple.spec.ts b/acceptance/tests/idp-apple.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-apple.spec.ts
rename to acceptance/tests/idp-apple.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-generic-jwt.spec.ts b/acceptance/tests/idp-generic-jwt.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-generic-jwt.spec.ts
rename to acceptance/tests/idp-generic-jwt.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-generic-oauth.spec.ts b/acceptance/tests/idp-generic-oauth.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-generic-oauth.spec.ts
rename to acceptance/tests/idp-generic-oauth.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-generic-oidc.spec.ts b/acceptance/tests/idp-generic-oidc.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-generic-oidc.spec.ts
rename to acceptance/tests/idp-generic-oidc.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-github-enterprise.spec.ts b/acceptance/tests/idp-github-enterprise.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-github-enterprise.spec.ts
rename to acceptance/tests/idp-github-enterprise.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-github.spec.ts b/acceptance/tests/idp-github.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-github.spec.ts
rename to acceptance/tests/idp-github.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-gitlab-self-hosted.spec.ts b/acceptance/tests/idp-gitlab-self-hosted.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-gitlab-self-hosted.spec.ts
rename to acceptance/tests/idp-gitlab-self-hosted.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-gitlab.spec.ts b/acceptance/tests/idp-gitlab.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-gitlab.spec.ts
rename to acceptance/tests/idp-gitlab.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-google.spec.ts b/acceptance/tests/idp-google.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-google.spec.ts
rename to acceptance/tests/idp-google.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-ldap.spec.ts b/acceptance/tests/idp-ldap.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-ldap.spec.ts
rename to acceptance/tests/idp-ldap.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-microsoft.spec.ts b/acceptance/tests/idp-microsoft.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-microsoft.spec.ts
rename to acceptance/tests/idp-microsoft.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/idp-saml.spec.ts b/acceptance/tests/idp-saml.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/idp-saml.spec.ts
rename to acceptance/tests/idp-saml.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/login-configuration-possiblities.spec.ts b/acceptance/tests/login-configuration-possiblities.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/login-configuration-possiblities.spec.ts
rename to acceptance/tests/login-configuration-possiblities.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/login.ts b/acceptance/tests/login.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/login.ts
rename to acceptance/tests/login.ts
diff --git a/login/apps/login-test-acceptance/tests/loginname-screen.ts b/acceptance/tests/loginname-screen.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/loginname-screen.ts
rename to acceptance/tests/loginname-screen.ts
diff --git a/login/apps/login-test-acceptance/tests/loginname.ts b/acceptance/tests/loginname.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/loginname.ts
rename to acceptance/tests/loginname.ts
diff --git a/login/apps/login-test-acceptance/tests/passkey.ts b/acceptance/tests/passkey.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/passkey.ts
rename to acceptance/tests/passkey.ts
diff --git a/login/apps/login-test-acceptance/tests/password-screen.ts b/acceptance/tests/password-screen.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/password-screen.ts
rename to acceptance/tests/password-screen.ts
diff --git a/login/apps/login-test-acceptance/tests/password.ts b/acceptance/tests/password.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/password.ts
rename to acceptance/tests/password.ts
diff --git a/login/apps/login-test-acceptance/tests/register-screen.ts b/acceptance/tests/register-screen.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/register-screen.ts
rename to acceptance/tests/register-screen.ts
diff --git a/login/apps/login-test-acceptance/tests/register.spec.ts b/acceptance/tests/register.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/register.spec.ts
rename to acceptance/tests/register.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/register.ts b/acceptance/tests/register.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/register.ts
rename to acceptance/tests/register.ts
diff --git a/login/apps/login-test-acceptance/tests/select-account.ts b/acceptance/tests/select-account.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/select-account.ts
rename to acceptance/tests/select-account.ts
diff --git a/login/apps/login-test-acceptance/tests/sink.ts b/acceptance/tests/sink.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/sink.ts
rename to acceptance/tests/sink.ts
diff --git a/login/apps/login-test-acceptance/tests/user.ts b/acceptance/tests/user.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/user.ts
rename to acceptance/tests/user.ts
diff --git a/login/apps/login-test-acceptance/tests/username-passkey.spec.ts b/acceptance/tests/username-passkey.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-passkey.spec.ts
rename to acceptance/tests/username-passkey.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-change-required.spec.ts b/acceptance/tests/username-password-change-required.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-change-required.spec.ts
rename to acceptance/tests/username-password-change-required.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-changed.spec.ts b/acceptance/tests/username-password-changed.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-changed.spec.ts
rename to acceptance/tests/username-password-changed.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-otp_email.spec.ts b/acceptance/tests/username-password-otp_email.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-otp_email.spec.ts
rename to acceptance/tests/username-password-otp_email.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-otp_sms.spec.ts b/acceptance/tests/username-password-otp_sms.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-otp_sms.spec.ts
rename to acceptance/tests/username-password-otp_sms.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-set.spec.ts b/acceptance/tests/username-password-set.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-set.spec.ts
rename to acceptance/tests/username-password-set.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-totp.spec.ts b/acceptance/tests/username-password-totp.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-totp.spec.ts
rename to acceptance/tests/username-password-totp.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password-u2f.spec.ts b/acceptance/tests/username-password-u2f.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password-u2f.spec.ts
rename to acceptance/tests/username-password-u2f.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/username-password.spec.ts b/acceptance/tests/username-password.spec.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/username-password.spec.ts
rename to acceptance/tests/username-password.spec.ts
diff --git a/login/apps/login-test-acceptance/tests/welcome.ts b/acceptance/tests/welcome.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/welcome.ts
rename to acceptance/tests/welcome.ts
diff --git a/login/apps/login-test-acceptance/tests/zitadel.ts b/acceptance/tests/zitadel.ts
similarity index 100%
rename from login/apps/login-test-acceptance/tests/zitadel.ts
rename to acceptance/tests/zitadel.ts
diff --git a/login/apps/login-test-acceptance/turbo.json b/acceptance/turbo.json
similarity index 100%
rename from login/apps/login-test-acceptance/turbo.json
rename to acceptance/turbo.json
diff --git a/login/apps/login-test-acceptance/zitadel.yaml b/acceptance/zitadel.yaml
similarity index 100%
rename from login/apps/login-test-acceptance/zitadel.yaml
rename to acceptance/zitadel.yaml
diff --git a/login/apps/login/.env.test b/login/.env.test
similarity index 100%
rename from login/apps/login/.env.test
rename to login/.env.test
diff --git a/login/.eslintrc.cjs b/login/.eslintrc.cjs
index 84711c5881..76ad0c10d8 100644
--- a/login/.eslintrc.cjs
+++ b/login/.eslintrc.cjs
@@ -1,10 +1,21 @@
 module.exports = {
-  root: true,
-  // Use basic ESLint config since the login app has its own detailed config
-  extends: ["eslint:recommended"],
-  settings: {
-    next: {
-      rootDir: ["apps/*/"],
+  parser: "@typescript-eslint/parser",
+  extends: ["next", "prettier"],
+  plugins: ["@typescript-eslint"],
+  rules: {
+    "@next/next/no-html-link-for-pages": "off",
+    "@next/next/no-img-element": "off",
+    "react/no-unescaped-entities": "off",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
+    "no-undef": "off",
+  },
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
     },
+    project: "./tsconfig.json",
   },
 };
diff --git a/login/.gitignore b/login/.gitignore
index 5fedf93c26..980d9c9514 100644
--- a/login/.gitignore
+++ b/login/.gitignore
@@ -1,26 +1,4 @@
-.DS_Store
-node_modules
-.turbo
-*.log
-.next
-dist
-dist-ssr
-*.local
-.env
-server/dist
-public/dist
-.vscode
-.idea
-.vercel
-.env*.local
-/blob-report/
-/out
-/docker
-
 custom-config.js
 .env*.local
 standalone
-
-
-# TypeScript build info
-tsconfig.tsbuildinfo
+tsconfig.tsbuildinfo
\ No newline at end of file
diff --git a/login/apps/login/.prettierignore b/login/.prettierignore
similarity index 100%
rename from login/apps/login/.prettierignore
rename to login/.prettierignore
diff --git a/login/apps/login/.prettierrc b/login/.prettierrc
similarity index 100%
rename from login/apps/login/.prettierrc
rename to login/.prettierrc
diff --git a/login/apps/login/.eslintrc.cjs b/login/apps/login/.eslintrc.cjs
deleted file mode 100644
index 76ad0c10d8..0000000000
--- a/login/apps/login/.eslintrc.cjs
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-  parser: "@typescript-eslint/parser",
-  extends: ["next", "prettier"],
-  plugins: ["@typescript-eslint"],
-  rules: {
-    "@next/next/no-html-link-for-pages": "off",
-    "@next/next/no-img-element": "off",
-    "react/no-unescaped-entities": "off",
-    "no-unused-vars": "off",
-    "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
-    "no-undef": "off",
-  },
-  parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
-    ecmaFeatures: {
-      jsx: true,
-    },
-    project: "./tsconfig.json",
-  },
-};
diff --git a/login/apps/login/Dockerfile b/login/apps/login/Dockerfile
deleted file mode 100644
index 06bd053076..0000000000
--- a/login/apps/login/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Dockerfile for standalone ZITADEL Login UI
-FROM node:18-alpine AS base
-
-# Install dependencies only when needed
-FROM base AS deps
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Prepare standalone and install dependencies
-COPY prepare-standalone.sh package*.json ./
-COPY *.standalone.* ./
-RUN ./prepare-standalone.sh
-
-# Rebuild the source code only when needed
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-
-# Prepare standalone configs
-RUN ./prepare-standalone.sh --no-install
-
-# Build application
-ENV NEXT_TELEMETRY_DISABLED 1
-RUN npm run build:standalone
-
-# Production image, copy all the files and run next
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-
-# Set the correct permission for prerender cache
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-
-# Automatically leverage output traces to reduce image size
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-
-EXPOSE 3000
-
-ENV PORT 3000
-ENV HOSTNAME "0.0.0.0"
-
-CMD ["node", "server.js"]
diff --git a/login/apps/login/constants/csp.js b/login/constants/csp.js
similarity index 100%
rename from login/apps/login/constants/csp.js
rename to login/constants/csp.js
diff --git a/login/integration/.eslintrc.cjs b/login/integration/.eslintrc.cjs
new file mode 100644
index 0000000000..7009e6fbfe
--- /dev/null
+++ b/login/integration/.eslintrc.cjs
@@ -0,0 +1,5 @@
+module.exports = {
+  root: true,
+  // Use basic ESLint config since the login app has its own detailed config
+  extends: ["eslint:recommended"],
+};
diff --git a/login/apps/login-test-integration/.gitignore b/login/integration/.gitignore
similarity index 100%
rename from login/apps/login-test-integration/.gitignore
rename to login/integration/.gitignore
diff --git a/login/apps/login-test-integration/core-mock/Dockerfile b/login/integration/core-mock/Dockerfile
similarity index 100%
rename from login/apps/login-test-integration/core-mock/Dockerfile
rename to login/integration/core-mock/Dockerfile
diff --git a/login/apps/login-test-integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json b/login/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json
similarity index 100%
rename from login/apps/login-test-integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json
rename to login/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json
diff --git a/login/apps/login-test-integration/core-mock/mocked-services.cfg b/login/integration/core-mock/mocked-services.cfg
similarity index 100%
rename from login/apps/login-test-integration/core-mock/mocked-services.cfg
rename to login/integration/core-mock/mocked-services.cfg
diff --git a/login/apps/login-test-integration/cypress.config.ts b/login/integration/cypress.config.ts
similarity index 100%
rename from login/apps/login-test-integration/cypress.config.ts
rename to login/integration/cypress.config.ts
diff --git a/login/apps/login-test-integration/docker-compose.yaml b/login/integration/docker-compose.yaml
similarity index 100%
rename from login/apps/login-test-integration/docker-compose.yaml
rename to login/integration/docker-compose.yaml
diff --git a/login/apps/login-test-integration/fixtures/example.json b/login/integration/fixtures/example.json
similarity index 100%
rename from login/apps/login-test-integration/fixtures/example.json
rename to login/integration/fixtures/example.json
diff --git a/login/apps/login-test-integration/integration/invite.cy.ts b/login/integration/integration/invite.cy.ts
similarity index 100%
rename from login/apps/login-test-integration/integration/invite.cy.ts
rename to login/integration/integration/invite.cy.ts
diff --git a/login/apps/login-test-integration/integration/login.cy.ts b/login/integration/integration/login.cy.ts
similarity index 100%
rename from login/apps/login-test-integration/integration/login.cy.ts
rename to login/integration/integration/login.cy.ts
diff --git a/login/apps/login-test-integration/integration/register-idp.cy.ts b/login/integration/integration/register-idp.cy.ts
similarity index 100%
rename from login/apps/login-test-integration/integration/register-idp.cy.ts
rename to login/integration/integration/register-idp.cy.ts
diff --git a/login/apps/login-test-integration/integration/register.cy.ts b/login/integration/integration/register.cy.ts
similarity index 100%
rename from login/apps/login-test-integration/integration/register.cy.ts
rename to login/integration/integration/register.cy.ts
diff --git a/login/apps/login-test-integration/integration/verify.cy.ts b/login/integration/integration/verify.cy.ts
similarity index 100%
rename from login/apps/login-test-integration/integration/verify.cy.ts
rename to login/integration/integration/verify.cy.ts
diff --git a/login/apps/login-test-integration/package.json b/login/integration/package.json
similarity index 100%
rename from login/apps/login-test-integration/package.json
rename to login/integration/package.json
diff --git a/login/apps/login-test-integration/support/e2e.ts b/login/integration/support/e2e.ts
similarity index 100%
rename from login/apps/login-test-integration/support/e2e.ts
rename to login/integration/support/e2e.ts
diff --git a/login/apps/login-test-integration/tsconfig.json b/login/integration/tsconfig.json
similarity index 100%
rename from login/apps/login-test-integration/tsconfig.json
rename to login/integration/tsconfig.json
diff --git a/login/apps/login-test-integration/turbo.json b/login/integration/turbo.json
similarity index 100%
rename from login/apps/login-test-integration/turbo.json
rename to login/integration/turbo.json
diff --git a/login/apps/login/locales/de.json b/login/locales/de.json
similarity index 100%
rename from login/apps/login/locales/de.json
rename to login/locales/de.json
diff --git a/login/apps/login/locales/en.json b/login/locales/en.json
similarity index 100%
rename from login/apps/login/locales/en.json
rename to login/locales/en.json
diff --git a/login/apps/login/locales/es.json b/login/locales/es.json
similarity index 100%
rename from login/apps/login/locales/es.json
rename to login/locales/es.json
diff --git a/login/apps/login/locales/it.json b/login/locales/it.json
similarity index 100%
rename from login/apps/login/locales/it.json
rename to login/locales/it.json
diff --git a/login/apps/login/locales/pl.json b/login/locales/pl.json
similarity index 100%
rename from login/apps/login/locales/pl.json
rename to login/locales/pl.json
diff --git a/login/apps/login/locales/ru.json b/login/locales/ru.json
similarity index 100%
rename from login/apps/login/locales/ru.json
rename to login/locales/ru.json
diff --git a/login/apps/login/locales/zh.json b/login/locales/zh.json
similarity index 100%
rename from login/apps/login/locales/zh.json
rename to login/locales/zh.json
diff --git a/login/apps/login/next-env-vars.d.ts b/login/next-env-vars.d.ts
similarity index 100%
rename from login/apps/login/next-env-vars.d.ts
rename to login/next-env-vars.d.ts
diff --git a/login/apps/login/next-env.d.ts b/login/next-env.d.ts
similarity index 100%
rename from login/apps/login/next-env.d.ts
rename to login/next-env.d.ts
diff --git a/login/apps/login/next.config.mjs b/login/next.config.mjs
similarity index 100%
rename from login/apps/login/next.config.mjs
rename to login/next.config.mjs
diff --git a/login/apps/login/package.json b/login/package.json
similarity index 100%
rename from login/apps/login/package.json
rename to login/package.json
diff --git a/login/apps/login/package.standalone.json b/login/package.standalone.json
similarity index 100%
rename from login/apps/login/package.standalone.json
rename to login/package.standalone.json
diff --git a/login/apps/login/postcss.config.cjs b/login/postcss.config.cjs
similarity index 100%
rename from login/apps/login/postcss.config.cjs
rename to login/postcss.config.cjs
diff --git a/login/apps/login/prepare-standalone.sh b/login/prepare-standalone.sh
similarity index 100%
rename from login/apps/login/prepare-standalone.sh
rename to login/prepare-standalone.sh
diff --git a/login/apps/login/prettier.config.mjs b/login/prettier.config.mjs
similarity index 100%
rename from login/apps/login/prettier.config.mjs
rename to login/prettier.config.mjs
diff --git a/login/apps/login/public/checkbox.svg b/login/public/checkbox.svg
similarity index 100%
rename from login/apps/login/public/checkbox.svg
rename to login/public/checkbox.svg
diff --git a/login/apps/login/public/favicon.ico b/login/public/favicon.ico
similarity index 100%
rename from login/apps/login/public/favicon.ico
rename to login/public/favicon.ico
diff --git a/login/apps/login/public/favicon/android-chrome-192x192.png b/login/public/favicon/android-chrome-192x192.png
similarity index 100%
rename from login/apps/login/public/favicon/android-chrome-192x192.png
rename to login/public/favicon/android-chrome-192x192.png
diff --git a/login/apps/login/public/favicon/android-chrome-512x512.png b/login/public/favicon/android-chrome-512x512.png
similarity index 100%
rename from login/apps/login/public/favicon/android-chrome-512x512.png
rename to login/public/favicon/android-chrome-512x512.png
diff --git a/login/apps/login/public/favicon/apple-touch-icon.png b/login/public/favicon/apple-touch-icon.png
similarity index 100%
rename from login/apps/login/public/favicon/apple-touch-icon.png
rename to login/public/favicon/apple-touch-icon.png
diff --git a/login/apps/login/public/favicon/browserconfig.xml b/login/public/favicon/browserconfig.xml
similarity index 100%
rename from login/apps/login/public/favicon/browserconfig.xml
rename to login/public/favicon/browserconfig.xml
diff --git a/login/apps/login/public/favicon/favicon-16x16.png b/login/public/favicon/favicon-16x16.png
similarity index 100%
rename from login/apps/login/public/favicon/favicon-16x16.png
rename to login/public/favicon/favicon-16x16.png
diff --git a/login/apps/login/public/favicon/favicon-32x32.png b/login/public/favicon/favicon-32x32.png
similarity index 100%
rename from login/apps/login/public/favicon/favicon-32x32.png
rename to login/public/favicon/favicon-32x32.png
diff --git a/login/apps/login/public/favicon/favicon.ico b/login/public/favicon/favicon.ico
similarity index 100%
rename from login/apps/login/public/favicon/favicon.ico
rename to login/public/favicon/favicon.ico
diff --git a/login/apps/login/public/favicon/mstile-150x150.png b/login/public/favicon/mstile-150x150.png
similarity index 100%
rename from login/apps/login/public/favicon/mstile-150x150.png
rename to login/public/favicon/mstile-150x150.png
diff --git a/login/apps/login/public/favicon/site.webmanifest b/login/public/favicon/site.webmanifest
similarity index 100%
rename from login/apps/login/public/favicon/site.webmanifest
rename to login/public/favicon/site.webmanifest
diff --git a/login/apps/login/public/grid-dark.svg b/login/public/grid-dark.svg
similarity index 100%
rename from login/apps/login/public/grid-dark.svg
rename to login/public/grid-dark.svg
diff --git a/login/apps/login/public/grid-light.svg b/login/public/grid-light.svg
similarity index 100%
rename from login/apps/login/public/grid-light.svg
rename to login/public/grid-light.svg
diff --git a/login/apps/login/public/logo/zitadel-logo-solo-darkdesign.svg b/login/public/logo/zitadel-logo-solo-darkdesign.svg
similarity index 100%
rename from login/apps/login/public/logo/zitadel-logo-solo-darkdesign.svg
rename to login/public/logo/zitadel-logo-solo-darkdesign.svg
diff --git a/login/apps/login/public/logo/zitadel-logo-solo-lightdesign.svg b/login/public/logo/zitadel-logo-solo-lightdesign.svg
similarity index 100%
rename from login/apps/login/public/logo/zitadel-logo-solo-lightdesign.svg
rename to login/public/logo/zitadel-logo-solo-lightdesign.svg
diff --git a/login/apps/login/public/zitadel-logo-dark.svg b/login/public/zitadel-logo-dark.svg
similarity index 100%
rename from login/apps/login/public/zitadel-logo-dark.svg
rename to login/public/zitadel-logo-dark.svg
diff --git a/login/apps/login/public/zitadel-logo-light.svg b/login/public/zitadel-logo-light.svg
similarity index 100%
rename from login/apps/login/public/zitadel-logo-light.svg
rename to login/public/zitadel-logo-light.svg
diff --git a/login/apps/login/readme.md b/login/readme.md
similarity index 100%
rename from login/apps/login/readme.md
rename to login/readme.md
diff --git a/login/apps/login/screenshots/accounts.png b/login/screenshots/accounts.png
similarity index 100%
rename from login/apps/login/screenshots/accounts.png
rename to login/screenshots/accounts.png
diff --git a/login/apps/login/screenshots/accounts_jumpto.png b/login/screenshots/accounts_jumpto.png
similarity index 100%
rename from login/apps/login/screenshots/accounts_jumpto.png
rename to login/screenshots/accounts_jumpto.png
diff --git a/login/apps/login/screenshots/collage.png b/login/screenshots/collage.png
similarity index 100%
rename from login/apps/login/screenshots/collage.png
rename to login/screenshots/collage.png
diff --git a/login/apps/login/screenshots/idp.png b/login/screenshots/idp.png
similarity index 100%
rename from login/apps/login/screenshots/idp.png
rename to login/screenshots/idp.png
diff --git a/login/apps/login/screenshots/loginname.png b/login/screenshots/loginname.png
similarity index 100%
rename from login/apps/login/screenshots/loginname.png
rename to login/screenshots/loginname.png
diff --git a/login/apps/login/screenshots/mfa.png b/login/screenshots/mfa.png
similarity index 100%
rename from login/apps/login/screenshots/mfa.png
rename to login/screenshots/mfa.png
diff --git a/login/apps/login/screenshots/mfaset.png b/login/screenshots/mfaset.png
similarity index 100%
rename from login/apps/login/screenshots/mfaset.png
rename to login/screenshots/mfaset.png
diff --git a/login/apps/login/screenshots/otp.png b/login/screenshots/otp.png
similarity index 100%
rename from login/apps/login/screenshots/otp.png
rename to login/screenshots/otp.png
diff --git a/login/apps/login/screenshots/otpset.png b/login/screenshots/otpset.png
similarity index 100%
rename from login/apps/login/screenshots/otpset.png
rename to login/screenshots/otpset.png
diff --git a/login/apps/login/screenshots/passkey.png b/login/screenshots/passkey.png
similarity index 100%
rename from login/apps/login/screenshots/passkey.png
rename to login/screenshots/passkey.png
diff --git a/login/apps/login/screenshots/password.png b/login/screenshots/password.png
similarity index 100%
rename from login/apps/login/screenshots/password.png
rename to login/screenshots/password.png
diff --git a/login/apps/login/screenshots/password_change.png b/login/screenshots/password_change.png
similarity index 100%
rename from login/apps/login/screenshots/password_change.png
rename to login/screenshots/password_change.png
diff --git a/login/apps/login/screenshots/password_set.png b/login/screenshots/password_set.png
similarity index 100%
rename from login/apps/login/screenshots/password_set.png
rename to login/screenshots/password_set.png
diff --git a/login/apps/login/screenshots/register.png b/login/screenshots/register.png
similarity index 100%
rename from login/apps/login/screenshots/register.png
rename to login/screenshots/register.png
diff --git a/login/apps/login/screenshots/register_password.png b/login/screenshots/register_password.png
similarity index 100%
rename from login/apps/login/screenshots/register_password.png
rename to login/screenshots/register_password.png
diff --git a/login/apps/login/screenshots/signedin.png b/login/screenshots/signedin.png
similarity index 100%
rename from login/apps/login/screenshots/signedin.png
rename to login/screenshots/signedin.png
diff --git a/login/apps/login/screenshots/u2f.png b/login/screenshots/u2f.png
similarity index 100%
rename from login/apps/login/screenshots/u2f.png
rename to login/screenshots/u2f.png
diff --git a/login/apps/login/screenshots/u2fset.png b/login/screenshots/u2fset.png
similarity index 100%
rename from login/apps/login/screenshots/u2fset.png
rename to login/screenshots/u2fset.png
diff --git a/login/apps/login/screenshots/verify.png b/login/screenshots/verify.png
similarity index 100%
rename from login/apps/login/screenshots/verify.png
rename to login/screenshots/verify.png
diff --git a/login/apps/login/src/app/(login)/accounts/page.tsx b/login/src/app/(login)/accounts/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/accounts/page.tsx
rename to login/src/app/(login)/accounts/page.tsx
diff --git a/login/apps/login/src/app/(login)/authenticator/set/page.tsx b/login/src/app/(login)/authenticator/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/authenticator/set/page.tsx
rename to login/src/app/(login)/authenticator/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/device/consent/page.tsx b/login/src/app/(login)/device/consent/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/device/consent/page.tsx
rename to login/src/app/(login)/device/consent/page.tsx
diff --git a/login/apps/login/src/app/(login)/device/page.tsx b/login/src/app/(login)/device/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/device/page.tsx
rename to login/src/app/(login)/device/page.tsx
diff --git a/login/apps/login/src/app/(login)/error.tsx b/login/src/app/(login)/error.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/error.tsx
rename to login/src/app/(login)/error.tsx
diff --git a/login/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx b/login/src/app/(login)/idp/[provider]/failure/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx
rename to login/src/app/(login)/idp/[provider]/failure/page.tsx
diff --git a/login/apps/login/src/app/(login)/idp/[provider]/success/page.tsx b/login/src/app/(login)/idp/[provider]/success/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/idp/[provider]/success/page.tsx
rename to login/src/app/(login)/idp/[provider]/success/page.tsx
diff --git a/login/apps/login/src/app/(login)/idp/ldap/page.tsx b/login/src/app/(login)/idp/ldap/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/idp/ldap/page.tsx
rename to login/src/app/(login)/idp/ldap/page.tsx
diff --git a/login/apps/login/src/app/(login)/idp/page.tsx b/login/src/app/(login)/idp/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/idp/page.tsx
rename to login/src/app/(login)/idp/page.tsx
diff --git a/login/apps/login/src/app/(login)/layout.tsx b/login/src/app/(login)/layout.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/layout.tsx
rename to login/src/app/(login)/layout.tsx
diff --git a/login/apps/login/src/app/(login)/loginname/page.tsx b/login/src/app/(login)/loginname/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/loginname/page.tsx
rename to login/src/app/(login)/loginname/page.tsx
diff --git a/login/apps/login/src/app/(login)/logout/page.tsx b/login/src/app/(login)/logout/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/logout/page.tsx
rename to login/src/app/(login)/logout/page.tsx
diff --git a/login/apps/login/src/app/(login)/logout/success/page.tsx b/login/src/app/(login)/logout/success/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/logout/success/page.tsx
rename to login/src/app/(login)/logout/success/page.tsx
diff --git a/login/apps/login/src/app/(login)/mfa/page.tsx b/login/src/app/(login)/mfa/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/mfa/page.tsx
rename to login/src/app/(login)/mfa/page.tsx
diff --git a/login/apps/login/src/app/(login)/mfa/set/page.tsx b/login/src/app/(login)/mfa/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/mfa/set/page.tsx
rename to login/src/app/(login)/mfa/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/otp/[method]/page.tsx b/login/src/app/(login)/otp/[method]/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/otp/[method]/page.tsx
rename to login/src/app/(login)/otp/[method]/page.tsx
diff --git a/login/apps/login/src/app/(login)/otp/[method]/set/page.tsx b/login/src/app/(login)/otp/[method]/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/otp/[method]/set/page.tsx
rename to login/src/app/(login)/otp/[method]/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/page.tsx b/login/src/app/(login)/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/page.tsx
rename to login/src/app/(login)/page.tsx
diff --git a/login/apps/login/src/app/(login)/passkey/page.tsx b/login/src/app/(login)/passkey/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/passkey/page.tsx
rename to login/src/app/(login)/passkey/page.tsx
diff --git a/login/apps/login/src/app/(login)/passkey/set/page.tsx b/login/src/app/(login)/passkey/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/passkey/set/page.tsx
rename to login/src/app/(login)/passkey/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/password/change/page.tsx b/login/src/app/(login)/password/change/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/password/change/page.tsx
rename to login/src/app/(login)/password/change/page.tsx
diff --git a/login/apps/login/src/app/(login)/password/page.tsx b/login/src/app/(login)/password/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/password/page.tsx
rename to login/src/app/(login)/password/page.tsx
diff --git a/login/apps/login/src/app/(login)/password/set/page.tsx b/login/src/app/(login)/password/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/password/set/page.tsx
rename to login/src/app/(login)/password/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/register/page.tsx b/login/src/app/(login)/register/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/register/page.tsx
rename to login/src/app/(login)/register/page.tsx
diff --git a/login/apps/login/src/app/(login)/register/password/page.tsx b/login/src/app/(login)/register/password/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/register/password/page.tsx
rename to login/src/app/(login)/register/password/page.tsx
diff --git a/login/apps/login/src/app/(login)/saml-post/route.ts b/login/src/app/(login)/saml-post/route.ts
similarity index 100%
rename from login/apps/login/src/app/(login)/saml-post/route.ts
rename to login/src/app/(login)/saml-post/route.ts
diff --git a/login/apps/login/src/app/(login)/signedin/page.tsx b/login/src/app/(login)/signedin/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/signedin/page.tsx
rename to login/src/app/(login)/signedin/page.tsx
diff --git a/login/apps/login/src/app/(login)/u2f/page.tsx b/login/src/app/(login)/u2f/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/u2f/page.tsx
rename to login/src/app/(login)/u2f/page.tsx
diff --git a/login/apps/login/src/app/(login)/u2f/set/page.tsx b/login/src/app/(login)/u2f/set/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/u2f/set/page.tsx
rename to login/src/app/(login)/u2f/set/page.tsx
diff --git a/login/apps/login/src/app/(login)/verify/page.tsx b/login/src/app/(login)/verify/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/verify/page.tsx
rename to login/src/app/(login)/verify/page.tsx
diff --git a/login/apps/login/src/app/(login)/verify/success/page.tsx b/login/src/app/(login)/verify/success/page.tsx
similarity index 100%
rename from login/apps/login/src/app/(login)/verify/success/page.tsx
rename to login/src/app/(login)/verify/success/page.tsx
diff --git a/login/apps/login/src/app/global-error.tsx b/login/src/app/global-error.tsx
similarity index 100%
rename from login/apps/login/src/app/global-error.tsx
rename to login/src/app/global-error.tsx
diff --git a/login/apps/login/src/app/healthy/route.ts b/login/src/app/healthy/route.ts
similarity index 100%
rename from login/apps/login/src/app/healthy/route.ts
rename to login/src/app/healthy/route.ts
diff --git a/login/apps/login/src/app/login/route.ts b/login/src/app/login/route.ts
similarity index 100%
rename from login/apps/login/src/app/login/route.ts
rename to login/src/app/login/route.ts
diff --git a/login/apps/login/src/app/security/route.ts b/login/src/app/security/route.ts
similarity index 100%
rename from login/apps/login/src/app/security/route.ts
rename to login/src/app/security/route.ts
diff --git a/login/apps/login/src/components/address-bar.tsx b/login/src/components/address-bar.tsx
similarity index 100%
rename from login/apps/login/src/components/address-bar.tsx
rename to login/src/components/address-bar.tsx
diff --git a/login/apps/login/src/components/alert.tsx b/login/src/components/alert.tsx
similarity index 100%
rename from login/apps/login/src/components/alert.tsx
rename to login/src/components/alert.tsx
diff --git a/login/apps/login/src/components/app-avatar.tsx b/login/src/components/app-avatar.tsx
similarity index 100%
rename from login/apps/login/src/components/app-avatar.tsx
rename to login/src/components/app-avatar.tsx
diff --git a/login/apps/login/src/components/auth-methods.tsx b/login/src/components/auth-methods.tsx
similarity index 100%
rename from login/apps/login/src/components/auth-methods.tsx
rename to login/src/components/auth-methods.tsx
diff --git a/login/apps/login/src/components/authentication-method-radio.tsx b/login/src/components/authentication-method-radio.tsx
similarity index 100%
rename from login/apps/login/src/components/authentication-method-radio.tsx
rename to login/src/components/authentication-method-radio.tsx
diff --git a/login/apps/login/src/components/avatar.tsx b/login/src/components/avatar.tsx
similarity index 100%
rename from login/apps/login/src/components/avatar.tsx
rename to login/src/components/avatar.tsx
diff --git a/login/apps/login/src/components/back-button.tsx b/login/src/components/back-button.tsx
similarity index 100%
rename from login/apps/login/src/components/back-button.tsx
rename to login/src/components/back-button.tsx
diff --git a/login/apps/login/src/components/boundary.tsx b/login/src/components/boundary.tsx
similarity index 100%
rename from login/apps/login/src/components/boundary.tsx
rename to login/src/components/boundary.tsx
diff --git a/login/apps/login/src/components/button.tsx b/login/src/components/button.tsx
similarity index 100%
rename from login/apps/login/src/components/button.tsx
rename to login/src/components/button.tsx
diff --git a/login/apps/login/src/components/change-password-form.tsx b/login/src/components/change-password-form.tsx
similarity index 100%
rename from login/apps/login/src/components/change-password-form.tsx
rename to login/src/components/change-password-form.tsx
diff --git a/login/apps/login/src/components/checkbox.tsx b/login/src/components/checkbox.tsx
similarity index 100%
rename from login/apps/login/src/components/checkbox.tsx
rename to login/src/components/checkbox.tsx
diff --git a/login/apps/login/src/components/choose-authenticator-to-login.tsx b/login/src/components/choose-authenticator-to-login.tsx
similarity index 100%
rename from login/apps/login/src/components/choose-authenticator-to-login.tsx
rename to login/src/components/choose-authenticator-to-login.tsx
diff --git a/login/apps/login/src/components/choose-authenticator-to-setup.tsx b/login/src/components/choose-authenticator-to-setup.tsx
similarity index 100%
rename from login/apps/login/src/components/choose-authenticator-to-setup.tsx
rename to login/src/components/choose-authenticator-to-setup.tsx
diff --git a/login/apps/login/src/components/choose-second-factor-to-setup.tsx b/login/src/components/choose-second-factor-to-setup.tsx
similarity index 100%
rename from login/apps/login/src/components/choose-second-factor-to-setup.tsx
rename to login/src/components/choose-second-factor-to-setup.tsx
diff --git a/login/apps/login/src/components/choose-second-factor.tsx b/login/src/components/choose-second-factor.tsx
similarity index 100%
rename from login/apps/login/src/components/choose-second-factor.tsx
rename to login/src/components/choose-second-factor.tsx
diff --git a/login/apps/login/src/components/consent.tsx b/login/src/components/consent.tsx
similarity index 100%
rename from login/apps/login/src/components/consent.tsx
rename to login/src/components/consent.tsx
diff --git a/login/apps/login/src/components/copy-to-clipboard.tsx b/login/src/components/copy-to-clipboard.tsx
similarity index 100%
rename from login/apps/login/src/components/copy-to-clipboard.tsx
rename to login/src/components/copy-to-clipboard.tsx
diff --git a/login/apps/login/src/components/default-tags.tsx b/login/src/components/default-tags.tsx
similarity index 100%
rename from login/apps/login/src/components/default-tags.tsx
rename to login/src/components/default-tags.tsx
diff --git a/login/apps/login/src/components/device-code-form.tsx b/login/src/components/device-code-form.tsx
similarity index 100%
rename from login/apps/login/src/components/device-code-form.tsx
rename to login/src/components/device-code-form.tsx
diff --git a/login/apps/login/src/components/dynamic-theme.tsx b/login/src/components/dynamic-theme.tsx
similarity index 100%
rename from login/apps/login/src/components/dynamic-theme.tsx
rename to login/src/components/dynamic-theme.tsx
diff --git a/login/apps/login/src/components/external-link.tsx b/login/src/components/external-link.tsx
similarity index 100%
rename from login/apps/login/src/components/external-link.tsx
rename to login/src/components/external-link.tsx
diff --git a/login/apps/login/src/components/idp-signin.tsx b/login/src/components/idp-signin.tsx
similarity index 100%
rename from login/apps/login/src/components/idp-signin.tsx
rename to login/src/components/idp-signin.tsx
diff --git a/login/apps/login/src/components/idps/base-button.tsx b/login/src/components/idps/base-button.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/base-button.tsx
rename to login/src/components/idps/base-button.tsx
diff --git a/login/apps/login/src/components/idps/pages/complete-idp.tsx b/login/src/components/idps/pages/complete-idp.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/pages/complete-idp.tsx
rename to login/src/components/idps/pages/complete-idp.tsx
diff --git a/login/apps/login/src/components/idps/pages/linking-failed.tsx b/login/src/components/idps/pages/linking-failed.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/pages/linking-failed.tsx
rename to login/src/components/idps/pages/linking-failed.tsx
diff --git a/login/apps/login/src/components/idps/pages/linking-success.tsx b/login/src/components/idps/pages/linking-success.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/pages/linking-success.tsx
rename to login/src/components/idps/pages/linking-success.tsx
diff --git a/login/apps/login/src/components/idps/pages/login-failed.tsx b/login/src/components/idps/pages/login-failed.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/pages/login-failed.tsx
rename to login/src/components/idps/pages/login-failed.tsx
diff --git a/login/apps/login/src/components/idps/pages/login-success.tsx b/login/src/components/idps/pages/login-success.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/pages/login-success.tsx
rename to login/src/components/idps/pages/login-success.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-apple.tsx b/login/src/components/idps/sign-in-with-apple.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-apple.tsx
rename to login/src/components/idps/sign-in-with-apple.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-azure-ad.tsx b/login/src/components/idps/sign-in-with-azure-ad.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-azure-ad.tsx
rename to login/src/components/idps/sign-in-with-azure-ad.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-generic.tsx b/login/src/components/idps/sign-in-with-generic.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-generic.tsx
rename to login/src/components/idps/sign-in-with-generic.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-github.tsx b/login/src/components/idps/sign-in-with-github.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-github.tsx
rename to login/src/components/idps/sign-in-with-github.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-gitlab.test.tsx b/login/src/components/idps/sign-in-with-gitlab.test.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-gitlab.test.tsx
rename to login/src/components/idps/sign-in-with-gitlab.test.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-gitlab.tsx b/login/src/components/idps/sign-in-with-gitlab.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-gitlab.tsx
rename to login/src/components/idps/sign-in-with-gitlab.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-google.test.tsx b/login/src/components/idps/sign-in-with-google.test.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-google.test.tsx
rename to login/src/components/idps/sign-in-with-google.test.tsx
diff --git a/login/apps/login/src/components/idps/sign-in-with-google.tsx b/login/src/components/idps/sign-in-with-google.tsx
similarity index 100%
rename from login/apps/login/src/components/idps/sign-in-with-google.tsx
rename to login/src/components/idps/sign-in-with-google.tsx
diff --git a/login/apps/login/src/components/input.tsx b/login/src/components/input.tsx
similarity index 100%
rename from login/apps/login/src/components/input.tsx
rename to login/src/components/input.tsx
diff --git a/login/apps/login/src/components/language-provider.tsx b/login/src/components/language-provider.tsx
similarity index 100%
rename from login/apps/login/src/components/language-provider.tsx
rename to login/src/components/language-provider.tsx
diff --git a/login/apps/login/src/components/language-switcher.tsx b/login/src/components/language-switcher.tsx
similarity index 100%
rename from login/apps/login/src/components/language-switcher.tsx
rename to login/src/components/language-switcher.tsx
diff --git a/login/apps/login/src/components/layout-providers.tsx b/login/src/components/layout-providers.tsx
similarity index 100%
rename from login/apps/login/src/components/layout-providers.tsx
rename to login/src/components/layout-providers.tsx
diff --git a/login/apps/login/src/components/ldap-username-password-form.tsx b/login/src/components/ldap-username-password-form.tsx
similarity index 100%
rename from login/apps/login/src/components/ldap-username-password-form.tsx
rename to login/src/components/ldap-username-password-form.tsx
diff --git a/login/apps/login/src/components/login-otp.tsx b/login/src/components/login-otp.tsx
similarity index 100%
rename from login/apps/login/src/components/login-otp.tsx
rename to login/src/components/login-otp.tsx
diff --git a/login/apps/login/src/components/login-passkey.tsx b/login/src/components/login-passkey.tsx
similarity index 100%
rename from login/apps/login/src/components/login-passkey.tsx
rename to login/src/components/login-passkey.tsx
diff --git a/login/apps/login/src/components/logo.tsx b/login/src/components/logo.tsx
similarity index 100%
rename from login/apps/login/src/components/logo.tsx
rename to login/src/components/logo.tsx
diff --git a/login/apps/login/src/components/password-complexity.test.tsx b/login/src/components/password-complexity.test.tsx
similarity index 100%
rename from login/apps/login/src/components/password-complexity.test.tsx
rename to login/src/components/password-complexity.test.tsx
diff --git a/login/apps/login/src/components/password-complexity.tsx b/login/src/components/password-complexity.tsx
similarity index 100%
rename from login/apps/login/src/components/password-complexity.tsx
rename to login/src/components/password-complexity.tsx
diff --git a/login/apps/login/src/components/password-form.tsx b/login/src/components/password-form.tsx
similarity index 100%
rename from login/apps/login/src/components/password-form.tsx
rename to login/src/components/password-form.tsx
diff --git a/login/apps/login/src/components/privacy-policy-checkboxes.tsx b/login/src/components/privacy-policy-checkboxes.tsx
similarity index 100%
rename from login/apps/login/src/components/privacy-policy-checkboxes.tsx
rename to login/src/components/privacy-policy-checkboxes.tsx
diff --git a/login/apps/login/src/components/register-form-idp-incomplete.tsx b/login/src/components/register-form-idp-incomplete.tsx
similarity index 100%
rename from login/apps/login/src/components/register-form-idp-incomplete.tsx
rename to login/src/components/register-form-idp-incomplete.tsx
diff --git a/login/apps/login/src/components/register-form.tsx b/login/src/components/register-form.tsx
similarity index 100%
rename from login/apps/login/src/components/register-form.tsx
rename to login/src/components/register-form.tsx
diff --git a/login/apps/login/src/components/register-passkey.tsx b/login/src/components/register-passkey.tsx
similarity index 100%
rename from login/apps/login/src/components/register-passkey.tsx
rename to login/src/components/register-passkey.tsx
diff --git a/login/apps/login/src/components/register-u2f.tsx b/login/src/components/register-u2f.tsx
similarity index 100%
rename from login/apps/login/src/components/register-u2f.tsx
rename to login/src/components/register-u2f.tsx
diff --git a/login/apps/login/src/components/self-service-menu.tsx b/login/src/components/self-service-menu.tsx
similarity index 100%
rename from login/apps/login/src/components/self-service-menu.tsx
rename to login/src/components/self-service-menu.tsx
diff --git a/login/apps/login/src/components/session-clear-item.tsx b/login/src/components/session-clear-item.tsx
similarity index 100%
rename from login/apps/login/src/components/session-clear-item.tsx
rename to login/src/components/session-clear-item.tsx
diff --git a/login/apps/login/src/components/session-item.tsx b/login/src/components/session-item.tsx
similarity index 100%
rename from login/apps/login/src/components/session-item.tsx
rename to login/src/components/session-item.tsx
diff --git a/login/apps/login/src/components/sessions-clear-list.tsx b/login/src/components/sessions-clear-list.tsx
similarity index 100%
rename from login/apps/login/src/components/sessions-clear-list.tsx
rename to login/src/components/sessions-clear-list.tsx
diff --git a/login/apps/login/src/components/sessions-list.tsx b/login/src/components/sessions-list.tsx
similarity index 100%
rename from login/apps/login/src/components/sessions-list.tsx
rename to login/src/components/sessions-list.tsx
diff --git a/login/apps/login/src/components/set-password-form.tsx b/login/src/components/set-password-form.tsx
similarity index 100%
rename from login/apps/login/src/components/set-password-form.tsx
rename to login/src/components/set-password-form.tsx
diff --git a/login/apps/login/src/components/set-register-password-form.tsx b/login/src/components/set-register-password-form.tsx
similarity index 100%
rename from login/apps/login/src/components/set-register-password-form.tsx
rename to login/src/components/set-register-password-form.tsx
diff --git a/login/apps/login/src/components/sign-in-with-idp.tsx b/login/src/components/sign-in-with-idp.tsx
similarity index 100%
rename from login/apps/login/src/components/sign-in-with-idp.tsx
rename to login/src/components/sign-in-with-idp.tsx
diff --git a/login/apps/login/src/components/skeleton-card.tsx b/login/src/components/skeleton-card.tsx
similarity index 100%
rename from login/apps/login/src/components/skeleton-card.tsx
rename to login/src/components/skeleton-card.tsx
diff --git a/login/apps/login/src/components/skeleton.tsx b/login/src/components/skeleton.tsx
similarity index 100%
rename from login/apps/login/src/components/skeleton.tsx
rename to login/src/components/skeleton.tsx
diff --git a/login/apps/login/src/components/spinner.tsx b/login/src/components/spinner.tsx
similarity index 100%
rename from login/apps/login/src/components/spinner.tsx
rename to login/src/components/spinner.tsx
diff --git a/login/apps/login/src/components/state-badge.tsx b/login/src/components/state-badge.tsx
similarity index 100%
rename from login/apps/login/src/components/state-badge.tsx
rename to login/src/components/state-badge.tsx
diff --git a/login/apps/login/src/components/tab-group.tsx b/login/src/components/tab-group.tsx
similarity index 100%
rename from login/apps/login/src/components/tab-group.tsx
rename to login/src/components/tab-group.tsx
diff --git a/login/apps/login/src/components/tab.tsx b/login/src/components/tab.tsx
similarity index 100%
rename from login/apps/login/src/components/tab.tsx
rename to login/src/components/tab.tsx
diff --git a/login/apps/login/src/components/theme-provider.tsx b/login/src/components/theme-provider.tsx
similarity index 100%
rename from login/apps/login/src/components/theme-provider.tsx
rename to login/src/components/theme-provider.tsx
diff --git a/login/apps/login/src/components/theme-wrapper.tsx b/login/src/components/theme-wrapper.tsx
similarity index 100%
rename from login/apps/login/src/components/theme-wrapper.tsx
rename to login/src/components/theme-wrapper.tsx
diff --git a/login/apps/login/src/components/theme.tsx b/login/src/components/theme.tsx
similarity index 100%
rename from login/apps/login/src/components/theme.tsx
rename to login/src/components/theme.tsx
diff --git a/login/apps/login/src/components/totp-register.tsx b/login/src/components/totp-register.tsx
similarity index 100%
rename from login/apps/login/src/components/totp-register.tsx
rename to login/src/components/totp-register.tsx
diff --git a/login/apps/login/src/components/translated.tsx b/login/src/components/translated.tsx
similarity index 100%
rename from login/apps/login/src/components/translated.tsx
rename to login/src/components/translated.tsx
diff --git a/login/apps/login/src/components/user-avatar.tsx b/login/src/components/user-avatar.tsx
similarity index 100%
rename from login/apps/login/src/components/user-avatar.tsx
rename to login/src/components/user-avatar.tsx
diff --git a/login/apps/login/src/components/username-form.tsx b/login/src/components/username-form.tsx
similarity index 100%
rename from login/apps/login/src/components/username-form.tsx
rename to login/src/components/username-form.tsx
diff --git a/login/apps/login/src/components/verify-form.tsx b/login/src/components/verify-form.tsx
similarity index 100%
rename from login/apps/login/src/components/verify-form.tsx
rename to login/src/components/verify-form.tsx
diff --git a/login/apps/login/src/components/zitadel-logo-dark.tsx b/login/src/components/zitadel-logo-dark.tsx
similarity index 100%
rename from login/apps/login/src/components/zitadel-logo-dark.tsx
rename to login/src/components/zitadel-logo-dark.tsx
diff --git a/login/apps/login/src/components/zitadel-logo-light.tsx b/login/src/components/zitadel-logo-light.tsx
similarity index 100%
rename from login/apps/login/src/components/zitadel-logo-light.tsx
rename to login/src/components/zitadel-logo-light.tsx
diff --git a/login/apps/login/src/components/zitadel-logo.tsx b/login/src/components/zitadel-logo.tsx
similarity index 100%
rename from login/apps/login/src/components/zitadel-logo.tsx
rename to login/src/components/zitadel-logo.tsx
diff --git a/login/apps/login/src/helpers/base64.ts b/login/src/helpers/base64.ts
similarity index 100%
rename from login/apps/login/src/helpers/base64.ts
rename to login/src/helpers/base64.ts
diff --git a/login/apps/login/src/helpers/colors.ts b/login/src/helpers/colors.ts
similarity index 100%
rename from login/apps/login/src/helpers/colors.ts
rename to login/src/helpers/colors.ts
diff --git a/login/apps/login/src/helpers/validators.ts b/login/src/helpers/validators.ts
similarity index 100%
rename from login/apps/login/src/helpers/validators.ts
rename to login/src/helpers/validators.ts
diff --git a/login/apps/login/src/i18n/request.ts b/login/src/i18n/request.ts
similarity index 100%
rename from login/apps/login/src/i18n/request.ts
rename to login/src/i18n/request.ts
diff --git a/login/apps/login/src/lib/api.ts b/login/src/lib/api.ts
similarity index 100%
rename from login/apps/login/src/lib/api.ts
rename to login/src/lib/api.ts
diff --git a/login/apps/login/src/lib/client.ts b/login/src/lib/client.ts
similarity index 100%
rename from login/apps/login/src/lib/client.ts
rename to login/src/lib/client.ts
diff --git a/login/apps/login/src/lib/cookies.ts b/login/src/lib/cookies.ts
similarity index 100%
rename from login/apps/login/src/lib/cookies.ts
rename to login/src/lib/cookies.ts
diff --git a/login/apps/login/src/lib/demos.ts b/login/src/lib/demos.ts
similarity index 100%
rename from login/apps/login/src/lib/demos.ts
rename to login/src/lib/demos.ts
diff --git a/login/apps/login/src/lib/fingerprint.ts b/login/src/lib/fingerprint.ts
similarity index 100%
rename from login/apps/login/src/lib/fingerprint.ts
rename to login/src/lib/fingerprint.ts
diff --git a/login/apps/login/src/lib/i18n.ts b/login/src/lib/i18n.ts
similarity index 100%
rename from login/apps/login/src/lib/i18n.ts
rename to login/src/lib/i18n.ts
diff --git a/login/apps/login/src/lib/idp.ts b/login/src/lib/idp.ts
similarity index 100%
rename from login/apps/login/src/lib/idp.ts
rename to login/src/lib/idp.ts
diff --git a/login/apps/login/src/lib/oidc.ts b/login/src/lib/oidc.ts
similarity index 100%
rename from login/apps/login/src/lib/oidc.ts
rename to login/src/lib/oidc.ts
diff --git a/login/apps/login/src/lib/saml.ts b/login/src/lib/saml.ts
similarity index 100%
rename from login/apps/login/src/lib/saml.ts
rename to login/src/lib/saml.ts
diff --git a/login/apps/login/src/lib/self.ts b/login/src/lib/self.ts
similarity index 100%
rename from login/apps/login/src/lib/self.ts
rename to login/src/lib/self.ts
diff --git a/login/apps/login/src/lib/server/cookie.ts b/login/src/lib/server/cookie.ts
similarity index 100%
rename from login/apps/login/src/lib/server/cookie.ts
rename to login/src/lib/server/cookie.ts
diff --git a/login/apps/login/src/lib/server/device.ts b/login/src/lib/server/device.ts
similarity index 100%
rename from login/apps/login/src/lib/server/device.ts
rename to login/src/lib/server/device.ts
diff --git a/login/apps/login/src/lib/server/idp.ts b/login/src/lib/server/idp.ts
similarity index 100%
rename from login/apps/login/src/lib/server/idp.ts
rename to login/src/lib/server/idp.ts
diff --git a/login/apps/login/src/lib/server/loginname.ts b/login/src/lib/server/loginname.ts
similarity index 100%
rename from login/apps/login/src/lib/server/loginname.ts
rename to login/src/lib/server/loginname.ts
diff --git a/login/apps/login/src/lib/server/oidc.ts b/login/src/lib/server/oidc.ts
similarity index 100%
rename from login/apps/login/src/lib/server/oidc.ts
rename to login/src/lib/server/oidc.ts
diff --git a/login/apps/login/src/lib/server/otp.ts b/login/src/lib/server/otp.ts
similarity index 100%
rename from login/apps/login/src/lib/server/otp.ts
rename to login/src/lib/server/otp.ts
diff --git a/login/apps/login/src/lib/server/passkeys.ts b/login/src/lib/server/passkeys.ts
similarity index 100%
rename from login/apps/login/src/lib/server/passkeys.ts
rename to login/src/lib/server/passkeys.ts
diff --git a/login/apps/login/src/lib/server/password.ts b/login/src/lib/server/password.ts
similarity index 100%
rename from login/apps/login/src/lib/server/password.ts
rename to login/src/lib/server/password.ts
diff --git a/login/apps/login/src/lib/server/register.ts b/login/src/lib/server/register.ts
similarity index 100%
rename from login/apps/login/src/lib/server/register.ts
rename to login/src/lib/server/register.ts
diff --git a/login/apps/login/src/lib/server/session.ts b/login/src/lib/server/session.ts
similarity index 100%
rename from login/apps/login/src/lib/server/session.ts
rename to login/src/lib/server/session.ts
diff --git a/login/apps/login/src/lib/server/u2f.ts b/login/src/lib/server/u2f.ts
similarity index 100%
rename from login/apps/login/src/lib/server/u2f.ts
rename to login/src/lib/server/u2f.ts
diff --git a/login/apps/login/src/lib/server/verify.ts b/login/src/lib/server/verify.ts
similarity index 100%
rename from login/apps/login/src/lib/server/verify.ts
rename to login/src/lib/server/verify.ts
diff --git a/login/apps/login/src/lib/service-url.ts b/login/src/lib/service-url.ts
similarity index 100%
rename from login/apps/login/src/lib/service-url.ts
rename to login/src/lib/service-url.ts
diff --git a/login/apps/login/src/lib/service.ts b/login/src/lib/service.ts
similarity index 100%
rename from login/apps/login/src/lib/service.ts
rename to login/src/lib/service.ts
diff --git a/login/apps/login/src/lib/session.ts b/login/src/lib/session.ts
similarity index 100%
rename from login/apps/login/src/lib/session.ts
rename to login/src/lib/session.ts
diff --git a/login/apps/login/src/lib/verify-helper.ts b/login/src/lib/verify-helper.ts
similarity index 100%
rename from login/apps/login/src/lib/verify-helper.ts
rename to login/src/lib/verify-helper.ts
diff --git a/login/apps/login/src/lib/zitadel.ts b/login/src/lib/zitadel.ts
similarity index 100%
rename from login/apps/login/src/lib/zitadel.ts
rename to login/src/lib/zitadel.ts
diff --git a/login/apps/login/src/middleware.ts b/login/src/middleware.ts
similarity index 100%
rename from login/apps/login/src/middleware.ts
rename to login/src/middleware.ts
diff --git a/login/apps/login/src/styles/globals.scss b/login/src/styles/globals.scss
similarity index 100%
rename from login/apps/login/src/styles/globals.scss
rename to login/src/styles/globals.scss
diff --git a/login/apps/login/src/styles/vars.scss b/login/src/styles/vars.scss
similarity index 100%
rename from login/apps/login/src/styles/vars.scss
rename to login/src/styles/vars.scss
diff --git a/login/apps/login/tailwind.config.mjs b/login/tailwind.config.mjs
similarity index 100%
rename from login/apps/login/tailwind.config.mjs
rename to login/tailwind.config.mjs
diff --git a/login/apps/login/test-setup.ts b/login/test-setup.ts
similarity index 100%
rename from login/apps/login/test-setup.ts
rename to login/test-setup.ts
diff --git a/login/apps/login/tsconfig.json b/login/tsconfig.json
similarity index 100%
rename from login/apps/login/tsconfig.json
rename to login/tsconfig.json
diff --git a/login/apps/login/turbo.json b/login/turbo.json
similarity index 100%
rename from login/apps/login/turbo.json
rename to login/turbo.json
diff --git a/login/apps/login/vitest.config.mts b/login/vitest.config.mts
similarity index 100%
rename from login/apps/login/vitest.config.mts
rename to login/vitest.config.mts
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 00eb7ba37c..13c117357f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,5 +2,7 @@ packages:
   - "console"
   - "docs"
   - "e2e"
-  - "login/apps/*"
+  - "acceptance"
+  - "login"
+  - "login/integration"
   - "clients/typescript/*"