diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml
index 3f3cd6676..66d4987db 100644
--- a/.github/workflows/web-api-publish.yml
+++ b/.github/workflows/web-api-publish.yml
@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v3.4.1
         with:
           node-version: '16'
diff --git a/Makefile b/Makefile
index 824db0c3c..6f1b568fd 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,9 @@ gen-client-ts:
 		-i /local/schema.yml \
 		-g typescript-fetch \
 		-o /local/gen-ts-api \
-		--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${NPM_VERSION}
+		--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${NPM_VERSION} \
+		--git-repo-id authentik \
+		--git-user-id goauthentik
 	mkdir -p web/node_modules/@goauthentik/api
 	\cp -fv scripts/web_api_readme.md gen-ts-api/README.md
 	cd gen-ts-api && npm i
diff --git a/authentik/core/templates/if/admin.html b/authentik/core/templates/if/admin.html
index 68b8f2768..b0fe05922 100644
--- a/authentik/core/templates/if/admin.html
+++ b/authentik/core/templates/if/admin.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block head %}
-<script src="{% static 'dist/admin/AdminInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/admin/AdminInterface.js' %}?version={{ version }}" type="module"></script>
 <meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
 <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
 <link rel="icon" href="{{ tenant.branding_favicon }}">
diff --git a/authentik/core/templates/if/flow.html b/authentik/core/templates/if/flow.html
index bc378f224..657c21579 100644
--- a/authentik/core/templates/if/flow.html
+++ b/authentik/core/templates/if/flow.html
@@ -23,7 +23,7 @@ window.authentik.flow = {
 {% endblock %}
 
 {% block head %}
-<script src="{% static 'dist/flow/FlowInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/flow/FlowInterface.js' %}?version={{ version }}" type="module"></script>
 <style>
 :root {
     --ak-flow-background: url("{{ flow.background_url }}");
diff --git a/authentik/core/templates/if/user.html b/authentik/core/templates/if/user.html
index 9a6e6da9e..ba4a7a7e5 100644
--- a/authentik/core/templates/if/user.html
+++ b/authentik/core/templates/if/user.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block head %}
-<script src="{% static 'dist/user/UserInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/user/UserInterface.js' %}?version={{ version }}" type="module"></script>
 <meta name="theme-color" content="#151515" media="(prefers-color-scheme: light)">
 <meta name="theme-color" content="#151515" media="(prefers-color-scheme: dark)">
 <link rel="icon" href="{{ tenant.branding_favicon }}">
diff --git a/authentik/tenants/utils.py b/authentik/tenants/utils.py
index a59fd49c2..87da6c8f6 100644
--- a/authentik/tenants/utils.py
+++ b/authentik/tenants/utils.py
@@ -6,6 +6,7 @@ from django.db.models import Value as V
 from django.http.request import HttpRequest
 from sentry_sdk.hub import Hub
 
+from authentik import get_full_version
 from authentik.lib.config import CONFIG
 from authentik.tenants.models import Tenant
 
@@ -37,4 +38,5 @@ def context_processor(request: HttpRequest) -> dict[str, Any]:
         "tenant": tenant,
         "footer_links": CONFIG.y("footer_links"),
         "sentry_trace": trace,
+        "version": get_full_version(),
     }
diff --git a/web/rollup.config.js b/web/rollup.config.js
index 8e4ff033f..06895a392 100644
--- a/web/rollup.config.js
+++ b/web/rollup.config.js
@@ -32,7 +32,7 @@ export const resources = [
         src: "node_modules/@patternfly/patternfly/components/Spinner/spinner.css",
         dest: "dist/",
     },
-    { src: "src/authentik.css", dest: "dist/" },
+    { src: "src/common/styles/authentik.css", dest: "dist/" },
     { src: "src/custom.css", dest: "dist/" },
 
     {
@@ -90,14 +90,14 @@ export const defaultOptions = {
     watch: {
         clearScreen: false,
     },
-    preserveEntrySignatures: false,
+    preserveEntrySignatures: "strict",
     cache: true,
     context: "window",
 };
 
 // Polyfills (imported first)
 export const POLY = {
-    input: "./poly.ts",
+    input: "./src/polyfill/poly.ts",
     output: [
         {
             format: "iife",
@@ -122,7 +122,7 @@ export default [
     POLY,
     // Flow interface
     {
-        input: "./src/interfaces/FlowInterface.ts",
+        input: "./src/flow/FlowInterface.ts",
         output: [
             {
                 format: "es",
@@ -135,7 +135,7 @@ export default [
     },
     // Admin interface
     {
-        input: "./src/interfaces/AdminInterface.ts",
+        input: "./src/admin/AdminInterface.ts",
         output: [
             {
                 format: "es",
@@ -148,7 +148,7 @@ export default [
     },
     // User interface
     {
-        input: "./src/interfaces/UserInterface.ts",
+        input: "./src/user/UserInterface.ts",
         output: [
             {
                 format: "es",
diff --git a/web/src/interfaces/AdminInterface.ts b/web/src/admin/AdminInterface.ts
similarity index 91%
rename from web/src/interfaces/AdminInterface.ts
rename to web/src/admin/AdminInterface.ts
index aae1e035a..554c34649 100644
--- a/web/src/interfaces/AdminInterface.ts
+++ b/web/src/admin/AdminInterface.ts
@@ -1,30 +1,31 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { WebsocketClient } from "@goauthentik/web/common/ws";
+import { ROUTES } from "@goauthentik/admin/Routes";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import {
     EVENT_API_DRAWER_TOGGLE,
     EVENT_NOTIFICATION_DRAWER_TOGGLE,
     EVENT_SIDEBAR_TOGGLE,
     VERSION,
-} from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/elements/notifications/NotificationDrawer";
-import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "@goauthentik/web/elements/router/Route";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import "@goauthentik/web/elements/router/RouterOutlet";
-import "@goauthentik/web/elements/sidebar/Sidebar";
-import "@goauthentik/web/elements/sidebar/SidebarItem";
-import "@goauthentik/web/interfaces/locale";
-import { ROUTES } from "@goauthentik/web/routesAdmin";
+} from "@goauthentik/common/constants";
+import { autoDetectLanguage } from "@goauthentik/common/ui/locale";
+import { me } from "@goauthentik/common/users";
+import { WebsocketClient } from "@goauthentik/common/ws";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/elements/notifications/NotificationDrawer";
+import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import "@goauthentik/elements/router/RouterOutlet";
+import "@goauthentik/elements/sidebar/Sidebar";
+import "@goauthentik/elements/sidebar/SidebarItem";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
@@ -32,8 +33,10 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import { AdminApi, Version } from "@goauthentik/api";
 
+autoDetectLanguage();
+
 @customElement("ak-interface-admin")
-export class AdminInterface extends LitElement {
+export class AdminInterface extends AKElement {
     @property({ type: Boolean })
     sidebarOpen = true;
 
diff --git a/web/src/routesAdmin.ts b/web/src/admin/Routes.ts
similarity index 68%
rename from web/src/routesAdmin.ts
rename to web/src/admin/Routes.ts
index bd34927bc..999acf4fd 100644
--- a/web/src/routesAdmin.ts
+++ b/web/src/admin/Routes.ts
@@ -1,5 +1,5 @@
-import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "@goauthentik/web/elements/router/Route";
-import "@goauthentik/web/pages/admin-overview/AdminOverviewPage";
+import "@goauthentik/admin/admin-overview/AdminOverviewPage";
+import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route";
 
 import { html } from "lit";
 
@@ -13,123 +13,123 @@ export const ROUTES: Route[] = [
         return html`<ak-admin-overview></ak-admin-overview>`;
     }),
     new Route(new RegExp("^/administration/dashboard/users$"), async () => {
-        await import("@goauthentik/web/pages/admin-overview/DashboardUserPage");
+        await import("@goauthentik/admin/admin-overview/DashboardUserPage");
         return html`<ak-admin-dashboard-users></ak-admin-dashboard-users>`;
     }),
     new Route(new RegExp("^/administration/system-tasks$"), async () => {
-        await import("@goauthentik/web/pages/system-tasks/SystemTaskListPage");
+        await import("@goauthentik/admin/system-tasks/SystemTaskListPage");
         return html`<ak-system-task-list></ak-system-task-list>`;
     }),
     new Route(new RegExp("^/core/providers$"), async () => {
-        await import("@goauthentik/web/pages/providers/ProviderListPage");
+        await import("@goauthentik/admin/providers/ProviderListPage");
         return html`<ak-provider-list></ak-provider-list>`;
     }),
     new Route(new RegExp(`^/core/providers/(?<id>${ID_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/providers/ProviderViewPage");
+        await import("@goauthentik/admin/providers/ProviderViewPage");
         return html`<ak-provider-view .providerID=${parseInt(args.id, 10)}></ak-provider-view>`;
     }),
     new Route(new RegExp("^/core/applications$"), async () => {
-        await import("@goauthentik/web/pages/applications/ApplicationListPage");
+        await import("@goauthentik/admin/applications/ApplicationListPage");
         return html`<ak-application-list></ak-application-list>`;
     }),
     new Route(new RegExp(`^/core/applications/(?<slug>${SLUG_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/applications/ApplicationViewPage");
+        await import("@goauthentik/admin/applications/ApplicationViewPage");
         return html`<ak-application-view .applicationSlug=${args.slug}></ak-application-view>`;
     }),
     new Route(new RegExp("^/core/sources$"), async () => {
-        await import("@goauthentik/web/pages/sources/SourceListPage");
+        await import("@goauthentik/admin/sources/SourceListPage");
         return html`<ak-source-list></ak-source-list>`;
     }),
     new Route(new RegExp(`^/core/sources/(?<slug>${SLUG_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/sources/SourceViewPage");
+        await import("@goauthentik/admin/sources/SourceViewPage");
         return html`<ak-source-view .sourceSlug=${args.slug}></ak-source-view>`;
     }),
     new Route(new RegExp("^/core/property-mappings$"), async () => {
-        await import("@goauthentik/web/pages/property-mappings/PropertyMappingListPage");
+        await import("@goauthentik/admin/property-mappings/PropertyMappingListPage");
         return html`<ak-property-mapping-list></ak-property-mapping-list>`;
     }),
     new Route(new RegExp("^/core/tokens$"), async () => {
-        await import("@goauthentik/web/pages/tokens/TokenListPage");
+        await import("@goauthentik/admin/tokens/TokenListPage");
         return html`<ak-token-list></ak-token-list>`;
     }),
     new Route(new RegExp("^/core/tenants$"), async () => {
-        await import("@goauthentik/web/pages/tenants/TenantListPage");
+        await import("@goauthentik/admin/tenants/TenantListPage");
         return html`<ak-tenant-list></ak-tenant-list>`;
     }),
     new Route(new RegExp("^/policy/policies$"), async () => {
-        await import("@goauthentik/web/pages/policies/PolicyListPage");
+        await import("@goauthentik/admin/policies/PolicyListPage");
         return html`<ak-policy-list></ak-policy-list>`;
     }),
     new Route(new RegExp("^/policy/reputation$"), async () => {
-        await import("@goauthentik/web/pages/policies/reputation/ReputationListPage");
+        await import("@goauthentik/admin/policies/reputation/ReputationListPage");
         return html`<ak-policy-reputation-list></ak-policy-reputation-list>`;
     }),
     new Route(new RegExp("^/identity/groups$"), async () => {
-        await import("@goauthentik/web/pages/groups/GroupListPage");
+        await import("@goauthentik/admin/groups/GroupListPage");
         return html`<ak-group-list></ak-group-list>`;
     }),
     new Route(new RegExp(`^/identity/groups/(?<uuid>${UUID_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/groups/GroupViewPage");
+        await import("@goauthentik/admin/groups/GroupViewPage");
         return html`<ak-group-view .groupId=${args.uuid}></ak-group-view>`;
     }),
     new Route(new RegExp("^/identity/users$"), async () => {
-        await import("@goauthentik/web/pages/users/UserListPage");
+        await import("@goauthentik/admin/users/UserListPage");
         return html`<ak-user-list></ak-user-list>`;
     }),
     new Route(new RegExp(`^/identity/users/(?<id>${ID_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/users/UserViewPage");
+        await import("@goauthentik/admin/users/UserViewPage");
         return html`<ak-user-view .userId=${parseInt(args.id, 10)}></ak-user-view>`;
     }),
     new Route(new RegExp("^/flow/stages/invitations$"), async () => {
-        await import("@goauthentik/web/pages/stages/invitation/InvitationListPage");
+        await import("@goauthentik/admin/stages/invitation/InvitationListPage");
         return html`<ak-stage-invitation-list></ak-stage-invitation-list>`;
     }),
     new Route(new RegExp("^/flow/stages/prompts$"), async () => {
-        await import("@goauthentik/web/pages/stages/prompt/PromptListPage");
+        await import("@goauthentik/admin/stages/prompt/PromptListPage");
         return html`<ak-stage-prompt-list></ak-stage-prompt-list>`;
     }),
     new Route(new RegExp("^/flow/stages$"), async () => {
-        await import("@goauthentik/web/pages/stages/StageListPage");
+        await import("@goauthentik/admin/stages/StageListPage");
         return html`<ak-stage-list></ak-stage-list>`;
     }),
     new Route(new RegExp("^/flow/flows$"), async () => {
-        await import("@goauthentik/web/pages/flows/FlowListPage");
+        await import("@goauthentik/admin/flows/FlowListPage");
         return html`<ak-flow-list></ak-flow-list>`;
     }),
     new Route(new RegExp(`^/flow/flows/(?<slug>${SLUG_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/flows/FlowViewPage");
+        await import("@goauthentik/admin/flows/FlowViewPage");
         return html`<ak-flow-view .flowSlug=${args.slug}></ak-flow-view>`;
     }),
     new Route(new RegExp("^/events/log$"), async () => {
-        await import("@goauthentik/web/pages/events/EventListPage");
+        await import("@goauthentik/admin/events/EventListPage");
         return html`<ak-event-list></ak-event-list>`;
     }),
     new Route(new RegExp(`^/events/log/(?<id>${UUID_REGEX})$`), async (args) => {
-        await import("@goauthentik/web/pages/events/EventInfoPage");
+        await import("@goauthentik/admin/events/EventInfoPage");
         return html`<ak-event-info-page .eventID=${args.id}></ak-event-info-page>`;
     }),
     new Route(new RegExp("^/events/transports$"), async () => {
-        await import("@goauthentik/web/pages/events/TransportListPage");
+        await import("@goauthentik/admin/events/TransportListPage");
         return html`<ak-event-transport-list></ak-event-transport-list>`;
     }),
     new Route(new RegExp("^/events/rules$"), async () => {
-        await import("@goauthentik/web/pages/events/RuleListPage");
+        await import("@goauthentik/admin/events/RuleListPage");
         return html`<ak-event-rule-list></ak-event-rule-list>`;
     }),
     new Route(new RegExp("^/outpost/outposts$"), async () => {
-        await import("@goauthentik/web/pages/outposts/OutpostListPage");
+        await import("@goauthentik/admin/outposts/OutpostListPage");
         return html`<ak-outpost-list></ak-outpost-list>`;
     }),
     new Route(new RegExp("^/outpost/integrations$"), async () => {
-        await import("@goauthentik/web/pages/outposts/ServiceConnectionListPage");
+        await import("@goauthentik/admin/outposts/ServiceConnectionListPage");
         return html`<ak-outpost-service-connection-list></ak-outpost-service-connection-list>`;
     }),
     new Route(new RegExp("^/crypto/certificates$"), async () => {
-        await import("@goauthentik/web/pages/crypto/CertificateKeyPairListPage");
+        await import("@goauthentik/admin/crypto/CertificateKeyPairListPage");
         return html`<ak-crypto-certificate-list></ak-crypto-certificate-list>`;
     }),
     new Route(new RegExp("^/blueprints/instances$"), async () => {
-        await import("@goauthentik/web/pages/blueprints/BlueprintListPage");
+        await import("@goauthentik/admin/blueprints/BlueprintListPage");
         return html`<ak-blueprint-list></ak-blueprint-list>`;
     }),
 ];
diff --git a/web/src/pages/admin-overview/AdminOverviewPage.ts b/web/src/admin/admin-overview/AdminOverviewPage.ts
similarity index 87%
rename from web/src/pages/admin-overview/AdminOverviewPage.ts
rename to web/src/admin/admin-overview/AdminOverviewPage.ts
index 51681096c..57f29f733 100644
--- a/web/src/pages/admin-overview/AdminOverviewPage.ts
+++ b/web/src/admin/admin-overview/AdminOverviewPage.ts
@@ -1,34 +1,35 @@
-import { me } from "@goauthentik/web/api/Users";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/cards/AggregatePromiseCard";
-import "@goauthentik/web/elements/charts/AdminLoginsChart";
-import { paramURL } from "@goauthentik/web/elements/router/RouterOutlet";
-import "@goauthentik/web/pages/admin-overview/TopApplicationsTable";
-import "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard";
-import "@goauthentik/web/pages/admin-overview/cards/SystemStatusCard";
-import "@goauthentik/web/pages/admin-overview/cards/VersionStatusCard";
-import "@goauthentik/web/pages/admin-overview/cards/WorkerStatusCard";
-import "@goauthentik/web/pages/admin-overview/charts/FlowStatusChart";
-import "@goauthentik/web/pages/admin-overview/charts/GroupCountStatusChart";
-import "@goauthentik/web/pages/admin-overview/charts/LDAPSyncStatusChart";
-import "@goauthentik/web/pages/admin-overview/charts/OutpostStatusChart";
-import "@goauthentik/web/pages/admin-overview/charts/PolicyStatusChart";
-import "@goauthentik/web/pages/admin-overview/charts/UserCountStatusChart";
+import "@goauthentik/admin/admin-overview/TopApplicationsTable";
+import "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
+import "@goauthentik/admin/admin-overview/cards/SystemStatusCard";
+import "@goauthentik/admin/admin-overview/cards/VersionStatusCard";
+import "@goauthentik/admin/admin-overview/cards/WorkerStatusCard";
+import "@goauthentik/admin/admin-overview/charts/FlowStatusChart";
+import "@goauthentik/admin/admin-overview/charts/GroupCountStatusChart";
+import "@goauthentik/admin/admin-overview/charts/LDAPSyncStatusChart";
+import "@goauthentik/admin/admin-overview/charts/OutpostStatusChart";
+import "@goauthentik/admin/admin-overview/charts/PolicyStatusChart";
+import "@goauthentik/admin/admin-overview/charts/UserCountStatusChart";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/cards/AggregatePromiseCard";
+import "@goauthentik/elements/charts/AdminLoginsChart";
+import { paramURL } from "@goauthentik/elements/router/RouterOutlet";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css";
 
 @customElement("ak-admin-overview")
-export class AdminOverviewPage extends LitElement {
+export class AdminOverviewPage extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFGrid,
diff --git a/web/src/pages/admin-overview/DashboardUserPage.ts b/web/src/admin/admin-overview/DashboardUserPage.ts
similarity index 89%
rename from web/src/pages/admin-overview/DashboardUserPage.ts
rename to web/src/admin/admin-overview/DashboardUserPage.ts
index 040cb191f..31d274038 100644
--- a/web/src/pages/admin-overview/DashboardUserPage.ts
+++ b/web/src/admin/admin-overview/DashboardUserPage.ts
@@ -1,13 +1,14 @@
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/cards/AggregatePromiseCard";
-import "@goauthentik/web/elements/charts/AdminModelPerDay";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/cards/AggregatePromiseCard";
+import "@goauthentik/elements/charts/AdminModelPerDay";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
@@ -16,7 +17,7 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css";
 import { EventActions } from "@goauthentik/api";
 
 @customElement("ak-admin-dashboard-users")
-export class DashboardUserPage extends LitElement {
+export class DashboardUserPage extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFGrid,
diff --git a/web/src/pages/admin-overview/TopApplicationsTable.ts b/web/src/admin/admin-overview/TopApplicationsTable.ts
similarity index 84%
rename from web/src/pages/admin-overview/TopApplicationsTable.ts
rename to web/src/admin/admin-overview/TopApplicationsTable.ts
index 38d356caf..dcd56e606 100644
--- a/web/src/pages/admin-overview/TopApplicationsTable.ts
+++ b/web/src/admin/admin-overview/TopApplicationsTable.ts
@@ -1,18 +1,19 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/Spinner";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Spinner";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFTable from "@patternfly/patternfly/components/Table/table.css";
 
 import { EventTopPerUser, EventsApi } from "@goauthentik/api";
 
 @customElement("ak-top-applications-table")
-export class TopApplicationsTable extends LitElement {
+export class TopApplicationsTable extends AKElement {
     @property({ attribute: false })
     topN?: EventTopPerUser[];
 
diff --git a/web/src/pages/admin-overview/cards/AdminStatusCard.ts b/web/src/admin/admin-overview/cards/AdminStatusCard.ts
similarity index 86%
rename from web/src/pages/admin-overview/cards/AdminStatusCard.ts
rename to web/src/admin/admin-overview/cards/AdminStatusCard.ts
index d6a4e5cc1..b773a78bc 100644
--- a/web/src/pages/admin-overview/cards/AdminStatusCard.ts
+++ b/web/src/admin/admin-overview/cards/AdminStatusCard.ts
@@ -1,6 +1,6 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import { AggregateCard } from "@goauthentik/web/elements/cards/AggregateCard";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard";
 
 import { TemplateResult, html } from "lit";
 import { until } from "lit/directives/until.js";
diff --git a/web/src/pages/admin-overview/cards/SystemStatusCard.ts b/web/src/admin/admin-overview/cards/SystemStatusCard.ts
similarity index 95%
rename from web/src/pages/admin-overview/cards/SystemStatusCard.ts
rename to web/src/admin/admin-overview/cards/SystemStatusCard.ts
index dfbc6141a..dd8d8aa8e 100644
--- a/web/src/pages/admin-overview/cards/SystemStatusCard.ts
+++ b/web/src/admin/admin-overview/cards/SystemStatusCard.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
 import {
     AdminStatus,
     AdminStatusCard,
-} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard";
+} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/admin-overview/cards/VersionStatusCard.ts b/web/src/admin/admin-overview/cards/VersionStatusCard.ts
similarity index 92%
rename from web/src/pages/admin-overview/cards/VersionStatusCard.ts
rename to web/src/admin/admin-overview/cards/VersionStatusCard.ts
index 3bbb1e835..f52b8caad 100644
--- a/web/src/pages/admin-overview/cards/VersionStatusCard.ts
+++ b/web/src/admin/admin-overview/cards/VersionStatusCard.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
 import {
     AdminStatus,
     AdminStatusCard,
-} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard";
+} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts
similarity index 87%
rename from web/src/pages/admin-overview/cards/WorkerStatusCard.ts
rename to web/src/admin/admin-overview/cards/WorkerStatusCard.ts
index 0bd676bf0..a850c8742 100644
--- a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts
+++ b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
 import {
     AdminStatus,
     AdminStatusCard,
-} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard";
+} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/admin-overview/charts/FlowStatusChart.ts b/web/src/admin/admin-overview/charts/FlowStatusChart.ts
similarity index 88%
rename from web/src/pages/admin-overview/charts/FlowStatusChart.ts
rename to web/src/admin/admin-overview/charts/FlowStatusChart.ts
index 536256847..cc8e14e21 100644
--- a/web/src/pages/admin-overview/charts/FlowStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/FlowStatusChart.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
+import "@goauthentik/elements/forms/ConfirmationForm";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts b/web/src/admin/admin-overview/charts/GroupCountStatusChart.ts
similarity index 92%
rename from web/src/pages/admin-overview/charts/GroupCountStatusChart.ts
rename to web/src/admin/admin-overview/charts/GroupCountStatusChart.ts
index dfd7dfaff..31989fec5 100644
--- a/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/GroupCountStatusChart.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts b/web/src/admin/admin-overview/charts/LDAPSyncStatusChart.ts
similarity index 93%
rename from web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
rename to web/src/admin/admin-overview/charts/LDAPSyncStatusChart.ts
index c9149ce26..fcb85605b 100644
--- a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/LDAPSyncStatusChart.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
+import "@goauthentik/elements/forms/ConfirmationForm";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/admin-overview/charts/OutpostStatusChart.ts b/web/src/admin/admin-overview/charts/OutpostStatusChart.ts
similarity index 91%
rename from web/src/pages/admin-overview/charts/OutpostStatusChart.ts
rename to web/src/admin/admin-overview/charts/OutpostStatusChart.ts
index 122a1e4b9..60c654043 100644
--- a/web/src/pages/admin-overview/charts/OutpostStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/OutpostStatusChart.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
+import "@goauthentik/elements/forms/ConfirmationForm";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/admin-overview/charts/PolicyStatusChart.ts b/web/src/admin/admin-overview/charts/PolicyStatusChart.ts
similarity index 91%
rename from web/src/pages/admin-overview/charts/PolicyStatusChart.ts
rename to web/src/admin/admin-overview/charts/PolicyStatusChart.ts
index 998fd8a85..466c84b4b 100644
--- a/web/src/pages/admin-overview/charts/PolicyStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/PolicyStatusChart.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
+import "@goauthentik/elements/forms/ConfirmationForm";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/admin-overview/charts/UserCountStatusChart.ts b/web/src/admin/admin-overview/charts/UserCountStatusChart.ts
similarity index 92%
rename from web/src/pages/admin-overview/charts/UserCountStatusChart.ts
rename to web/src/admin/admin-overview/charts/UserCountStatusChart.ts
index 5d1a4fae9..f0586ac12 100644
--- a/web/src/pages/admin-overview/charts/UserCountStatusChart.ts
+++ b/web/src/admin/admin-overview/charts/UserCountStatusChart.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData, ChartOptions } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/applications/ApplicationCheckAccessForm.ts b/web/src/admin/applications/ApplicationCheckAccessForm.ts
similarity index 94%
rename from web/src/pages/applications/ApplicationCheckAccessForm.ts
rename to web/src/admin/applications/ApplicationCheckAccessForm.ts
index 16c3da59f..949bad0dd 100644
--- a/web/src/pages/applications/ApplicationCheckAccessForm.ts
+++ b/web/src/admin/applications/ApplicationCheckAccessForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { UserOption } from "@goauthentik/elements/user/utils";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/admin/applications/ApplicationForm.ts
similarity index 96%
rename from web/src/pages/applications/ApplicationForm.ts
rename to web/src/admin/applications/ApplicationForm.ts
index 3d9e15d5b..7f1b2ae22 100644
--- a/web/src/pages/applications/ApplicationForm.ts
+++ b/web/src/admin/applications/ApplicationForm.ts
@@ -1,11 +1,11 @@
-import { DEFAULT_CONFIG, config } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/pages/providers/ProviderWizard";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/admin/providers/ProviderWizard";
+import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import "@goauthentik/elements/forms/ModalForm";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/forms/ProxyForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/admin/applications/ApplicationListPage.ts
similarity index 87%
rename from web/src/pages/applications/ApplicationListPage.ts
rename to web/src/admin/applications/ApplicationListPage.ts
index d7ae543e7..bc859326d 100644
--- a/web/src/pages/applications/ApplicationListPage.ts
+++ b/web/src/admin/applications/ApplicationListPage.ts
@@ -1,16 +1,16 @@
+import "@goauthentik/admin/applications/ApplicationForm";
+import "@goauthentik/admin/applications/wizard/ApplicationWizard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
 import MDApplication from "@goauthentik/docs/core/applications.md";
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/Markdown";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { getURLParam } from "@goauthentik/web/elements/router/RouteMatch";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/applications/ApplicationForm";
-import "@goauthentik/web/pages/applications/wizard/ApplicationWizard";
+import "@goauthentik/elements/Markdown";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { getURLParam } from "@goauthentik/elements/router/RouteMatch";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -18,7 +18,7 @@ import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 
@@ -44,7 +44,7 @@ export class ApplicationListPage extends TablePage<Application> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Application>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Application>> {
         return new CoreApi(DEFAULT_CONFIG).coreApplicationsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/admin/applications/ApplicationViewPage.ts
similarity index 94%
rename from web/src/pages/applications/ApplicationViewPage.ts
rename to web/src/admin/applications/ApplicationViewPage.ts
index 5c7ea8c33..2c2cec801 100644
--- a/web/src/pages/applications/ApplicationViewPage.ts
+++ b/web/src/admin/applications/ApplicationViewPage.ts
@@ -1,21 +1,22 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/charts/ApplicationAuthorizeChart";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/applications/ApplicationCheckAccessForm";
-import "@goauthentik/web/pages/applications/ApplicationForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
+import "@goauthentik/admin/applications/ApplicationCheckAccessForm";
+import "@goauthentik/admin/applications/ApplicationForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/charts/ApplicationAuthorizeChart";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -28,7 +29,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { Application, CoreApi, OutpostsApi } from "@goauthentik/api";
 
 @customElement("ak-application-view")
-export class ApplicationViewPage extends LitElement {
+export class ApplicationViewPage extends AKElement {
     @property()
     set applicationSlug(value: string) {
         new CoreApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/applications/wizard/ApplicationWizard.ts b/web/src/admin/applications/wizard/ApplicationWizard.ts
similarity index 53%
rename from web/src/pages/applications/wizard/ApplicationWizard.ts
rename to web/src/admin/applications/wizard/ApplicationWizard.ts
index d8b225d5d..04a3fc078 100644
--- a/web/src/pages/applications/wizard/ApplicationWizard.ts
+++ b/web/src/admin/applications/wizard/ApplicationWizard.ts
@@ -1,30 +1,31 @@
-import "@goauthentik/web/elements/wizard/Wizard";
-import "@goauthentik/web/pages/applications/wizard/InitialApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/TypeApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/link/TypeLinkApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage";
-import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/InitialApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/TypeApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/link/TypeLinkApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage";
+import "@goauthentik/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/wizard/Wizard";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-application-wizard")
-export class ApplicationWizard extends LitElement {
+export class ApplicationWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/applications/wizard/InitialApplicationWizardPage.ts b/web/src/admin/applications/wizard/InitialApplicationWizardPage.ts
similarity index 88%
rename from web/src/pages/applications/wizard/InitialApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/InitialApplicationWizardPage.ts
index b916f8ef5..5eed1a28a 100644
--- a/web/src/pages/applications/wizard/InitialApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/InitialApplicationWizardPage.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
-import { convertToSlug } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { convertToSlug } from "@goauthentik/common/utils";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/TypeApplicationWizardPage.ts b/web/src/admin/applications/wizard/TypeApplicationWizardPage.ts
similarity index 95%
rename from web/src/pages/applications/wizard/TypeApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/TypeApplicationWizardPage.ts
index d0d789932..2f0c05188 100644
--- a/web/src/pages/applications/wizard/TypeApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/TypeApplicationWizardPage.ts
@@ -1,11 +1,11 @@
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
 import { CSSResult, TemplateResult, html } from "lit";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
diff --git a/web/src/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts b/web/src/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
similarity index 91%
rename from web/src/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
index f95c5a4ee..0e19701d4 100644
--- a/web/src/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/link/TypeLinkApplicationWizardPage.ts b/web/src/admin/applications/wizard/link/TypeLinkApplicationWizardPage.ts
similarity index 82%
rename from web/src/pages/applications/wizard/link/TypeLinkApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/link/TypeLinkApplicationWizardPage.ts
index ba6f30e67..e36a15a66 100644
--- a/web/src/pages/applications/wizard/link/TypeLinkApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/link/TypeLinkApplicationWizardPage.ts
@@ -1,6 +1,6 @@
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts b/web/src/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
similarity index 86%
rename from web/src/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
index 3224f3ebc..3c618e038 100644
--- a/web/src/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
 import { CSSResult, TemplateResult, html } from "lit";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
diff --git a/web/src/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts b/web/src/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
similarity index 94%
rename from web/src/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
index 9963c446c..331d23781 100644
--- a/web/src/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
 import { CSSResult, TemplateResult, html } from "lit";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
diff --git a/web/src/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts b/web/src/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
similarity index 88%
rename from web/src/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
index 6902d1530..78860c82e 100644
--- a/web/src/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
-import "@goauthentik/web/elements/wizard/WizardFormPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
+import "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts b/web/src/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
similarity index 76%
rename from web/src/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
index 60361f473..a8a736da5 100644
--- a/web/src/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
@@ -1,5 +1,5 @@
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts b/web/src/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
similarity index 89%
rename from web/src/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
index 18539d3b8..c9d4c978f 100644
--- a/web/src/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts b/web/src/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
similarity index 92%
rename from web/src/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
index a20a178ce..2b9a9ba75 100644
--- a/web/src/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
 import { CSSResult, TemplateResult, html } from "lit";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
diff --git a/web/src/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts b/web/src/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
similarity index 88%
rename from web/src/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
index e506952da..63e6e2574 100644
--- a/web/src/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts b/web/src/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
similarity index 88%
rename from web/src/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
rename to web/src/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
index 21586ad11..82733a70e 100644
--- a/web/src/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
+++ b/web/src/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts
similarity index 92%
rename from web/src/pages/blueprints/BlueprintForm.ts
rename to web/src/admin/blueprints/BlueprintForm.ts
index c1b92f83c..d31fca904 100644
--- a/web/src/pages/blueprints/BlueprintForm.ts
+++ b/web/src/admin/blueprints/BlueprintForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/blueprints/BlueprintListPage.ts b/web/src/admin/blueprints/BlueprintListPage.ts
similarity index 84%
rename from web/src/pages/blueprints/BlueprintListPage.ts
rename to web/src/admin/blueprints/BlueprintListPage.ts
index 1a0913b9a..9ddb6c26f 100644
--- a/web/src/pages/blueprints/BlueprintListPage.ts
+++ b/web/src/admin/blueprints/BlueprintListPage.ts
@@ -1,15 +1,15 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/blueprints/BlueprintForm";
+import "@goauthentik/admin/blueprints/BlueprintForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -25,13 +25,12 @@ export function BlueprintStatus(blueprint?: BlueprintInstance): string {
             return t`Successful`;
         case BlueprintInstanceStatusEnum.Orphaned:
             return t`Orphaned`;
-        case BlueprintInstanceStatusEnum.Unknown:
-            return t`Unknown`;
         case BlueprintInstanceStatusEnum.Warning:
             return t`Warning`;
         case BlueprintInstanceStatusEnum.Error:
             return t`Error`;
     }
+    return t`Unknown`;
 }
 @customElement("ak-blueprint-list")
 export class BlueprintListPage extends TablePage<BlueprintInstance> {
@@ -53,7 +52,7 @@ export class BlueprintListPage extends TablePage<BlueprintInstance> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<BlueprintInstance>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<BlueprintInstance>> {
         return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/crypto/CertificateGenerateForm.ts b/web/src/admin/crypto/CertificateGenerateForm.ts
similarity index 89%
rename from web/src/pages/crypto/CertificateGenerateForm.ts
rename to web/src/admin/crypto/CertificateGenerateForm.ts
index a0a77f9b7..7ccf46f29 100644
--- a/web/src/pages/crypto/CertificateGenerateForm.ts
+++ b/web/src/admin/crypto/CertificateGenerateForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/crypto/CertificateKeyPairForm.ts b/web/src/admin/crypto/CertificateKeyPairForm.ts
similarity index 91%
rename from web/src/pages/crypto/CertificateKeyPairForm.ts
rename to web/src/admin/crypto/CertificateKeyPairForm.ts
index 4b2f64a01..b598562e5 100644
--- a/web/src/pages/crypto/CertificateKeyPairForm.ts
+++ b/web/src/admin/crypto/CertificateKeyPairForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/crypto/CertificateKeyPairListPage.ts b/web/src/admin/crypto/CertificateKeyPairListPage.ts
similarity index 91%
rename from web/src/pages/crypto/CertificateKeyPairListPage.ts
rename to web/src/admin/crypto/CertificateKeyPairListPage.ts
index e3c3c0484..9bd678a2e 100644
--- a/web/src/pages/crypto/CertificateKeyPairListPage.ts
+++ b/web/src/admin/crypto/CertificateKeyPairListPage.ts
@@ -1,14 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/crypto/CertificateGenerateForm";
-import "@goauthentik/web/pages/crypto/CertificateKeyPairForm";
+import "@goauthentik/admin/crypto/CertificateGenerateForm";
+import "@goauthentik/admin/crypto/CertificateKeyPairForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -44,7 +44,7 @@ export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
         return super.styles.concat(PFDescriptionList);
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<CertificateKeyPair>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<CertificateKeyPair>> {
         return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/events/EventInfo.ts b/web/src/admin/events/EventInfo.ts
similarity index 97%
rename from web/src/pages/events/EventInfo.ts
rename to web/src/admin/events/EventInfo.ts
index 19f36ac9b..6f8194f57 100644
--- a/web/src/pages/events/EventInfo.ts
+++ b/web/src/admin/events/EventInfo.ts
@@ -1,13 +1,14 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EventContext, EventModel, EventWithContext } from "@goauthentik/web/api/Events";
-import { VERSION } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/Expand";
-import "@goauthentik/web/elements/Spinner";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { VERSION } from "@goauthentik/common/constants";
+import { EventContext, EventModel, EventWithContext } from "@goauthentik/common/events";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Expand";
+import "@goauthentik/elements/Spinner";
+import { PFSize } from "@goauthentik/elements/Spinner";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
@@ -20,7 +21,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { EventActions, FlowsApi } from "@goauthentik/api";
 
 @customElement("ak-event-info")
-export class EventInfo extends LitElement {
+export class EventInfo extends AKElement {
     @property({ attribute: false })
     event!: EventWithContext;
 
diff --git a/web/src/pages/events/EventInfoPage.ts b/web/src/admin/events/EventInfoPage.ts
similarity index 77%
rename from web/src/pages/events/EventInfoPage.ts
rename to web/src/admin/events/EventInfoPage.ts
index 87050496b..935afee47 100644
--- a/web/src/pages/events/EventInfoPage.ts
+++ b/web/src/admin/events/EventInfoPage.ts
@@ -1,14 +1,15 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EventWithContext } from "@goauthentik/web/api/Events";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/pages/events/EventInfo";
+import "@goauthentik/admin/events/EventInfo";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EventWithContext } from "@goauthentik/common/events";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/PageHeader";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
@@ -17,7 +18,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { EventsApi } from "@goauthentik/api";
 
 @customElement("ak-event-info-page")
-export class EventInfoPage extends LitElement {
+export class EventInfoPage extends AKElement {
     @property()
     set eventID(value: string) {
         new EventsApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/events/EventListPage.ts b/web/src/admin/events/EventListPage.ts
similarity index 81%
rename from web/src/pages/events/EventListPage.ts
rename to web/src/admin/events/EventListPage.ts
index 9c27155e7..14c4d3fd8 100644
--- a/web/src/pages/events/EventListPage.ts
+++ b/web/src/admin/events/EventListPage.ts
@@ -1,11 +1,11 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EventWithContext } from "@goauthentik/web/api/Events";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/events/EventInfo";
-import { ActionToLabel } from "@goauthentik/web/pages/events/utils";
+import "@goauthentik/admin/events/EventInfo";
+import { ActionToLabel } from "@goauthentik/admin/events/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EventWithContext } from "@goauthentik/common/events";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -34,7 +34,7 @@ export class EventListPage extends TablePage<Event> {
     @property()
     order = "-created";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Event>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Event>> {
         return new EventsApi(DEFAULT_CONFIG).eventsEventsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts
similarity index 96%
rename from web/src/pages/events/RuleForm.ts
rename to web/src/admin/events/RuleForm.ts
index 2d7e92ab8..294520779 100644
--- a/web/src/pages/events/RuleForm.ts
+++ b/web/src/admin/events/RuleForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/events/RuleListPage.ts b/web/src/admin/events/RuleListPage.ts
similarity index 84%
rename from web/src/pages/events/RuleListPage.ts
rename to web/src/admin/events/RuleListPage.ts
index fe0e02d3f..9e72f9d6d 100644
--- a/web/src/pages/events/RuleListPage.ts
+++ b/web/src/admin/events/RuleListPage.ts
@@ -1,13 +1,13 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/events/RuleForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
+import "@goauthentik/admin/events/RuleForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -37,7 +37,7 @@ export class RuleListPage extends TablePage<NotificationRule> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<NotificationRule>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<NotificationRule>> {
         return new EventsApi(DEFAULT_CONFIG).eventsRulesList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts
similarity index 96%
rename from web/src/pages/events/TransportForm.ts
rename to web/src/admin/events/TransportForm.ts
index f6f723b98..82a55f0a8 100644
--- a/web/src/pages/events/TransportForm.ts
+++ b/web/src/admin/events/TransportForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/events/TransportListPage.ts b/web/src/admin/events/TransportListPage.ts
similarity index 84%
rename from web/src/pages/events/TransportListPage.ts
rename to web/src/admin/events/TransportListPage.ts
index 6d0930963..3b053f9b5 100644
--- a/web/src/pages/events/TransportListPage.ts
+++ b/web/src/admin/events/TransportListPage.ts
@@ -1,13 +1,13 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/events/TransportForm";
+import "@goauthentik/admin/events/TransportForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -36,7 +36,7 @@ export class TransportListPage extends TablePage<NotificationTransport> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<NotificationTransport>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<NotificationTransport>> {
         return new EventsApi(DEFAULT_CONFIG).eventsTransportsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/events/utils.ts b/web/src/admin/events/utils.ts
similarity index 100%
rename from web/src/pages/events/utils.ts
rename to web/src/admin/events/utils.ts
diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/admin/flows/BoundStagesList.ts
similarity index 88%
rename from web/src/pages/flows/BoundStagesList.ts
rename to web/src/admin/flows/BoundStagesList.ts
index 793d576b8..9c4d86776 100644
--- a/web/src/pages/flows/BoundStagesList.ts
+++ b/web/src/admin/flows/BoundStagesList.ts
@@ -1,14 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/pages/flows/StageBindingForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
-import "@goauthentik/web/pages/stages/StageWizard";
+import "@goauthentik/admin/flows/StageBindingForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import "@goauthentik/admin/stages/StageWizard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -26,7 +26,7 @@ export class BoundStagesList extends Table<FlowStageBinding> {
     @property()
     target?: string;
 
-    async apiEndpoint(page: number): Promise<AKResponse<FlowStageBinding>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<FlowStageBinding>> {
         return new FlowsApi(DEFAULT_CONFIG).flowsBindingsList({
             target: this.target || "",
             ordering: "order",
diff --git a/web/src/pages/flows/FlowDiagram.ts b/web/src/admin/flows/FlowDiagram.ts
similarity index 90%
rename from web/src/pages/flows/FlowDiagram.ts
rename to web/src/admin/flows/FlowDiagram.ts
index 61d032202..c16d73bbc 100644
--- a/web/src/pages/flows/FlowDiagram.ts
+++ b/web/src/admin/flows/FlowDiagram.ts
@@ -1,9 +1,10 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/EmptyState";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
 import FlowChart from "flowchart.js";
 
-import { LitElement, TemplateResult, html } from "lit";
+import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import { FlowsApi } from "@goauthentik/api";
@@ -14,7 +15,7 @@ export const FILL_DARK_MODE = "#18191a";
 export const FILL_LIGHT_MODE = "#f0f0f0";
 
 @customElement("ak-flow-diagram")
-export class FlowDiagram extends LitElement {
+export class FlowDiagram extends AKElement {
     _flowSlug?: string;
 
     @property()
diff --git a/web/src/pages/flows/FlowForm.ts b/web/src/admin/flows/FlowForm.ts
similarity index 97%
rename from web/src/pages/flows/FlowForm.ts
rename to web/src/admin/flows/FlowForm.ts
index c619ca056..e205eb541 100644
--- a/web/src/pages/flows/FlowForm.ts
+++ b/web/src/admin/flows/FlowForm.ts
@@ -1,9 +1,8 @@
-import { DeniedActionEnum } from "@goauthentik/api/dist/models/DeniedActionEnum.js";
-import { DEFAULT_CONFIG, config } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { DesignationToLabel, LayoutToLabel } from "@goauthentik/web/pages/flows/utils";
-import { first } from "@goauthentik/web/utils";
+import { DesignationToLabel, LayoutToLabel } from "@goauthentik/admin/flows/utils";
+import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
@@ -14,6 +13,7 @@ import { until } from "lit/directives/until.js";
 
 import {
     CapabilitiesEnum,
+    DeniedActionEnum,
     Flow,
     FlowDesignationEnum,
     FlowsApi,
diff --git a/web/src/pages/flows/FlowImportForm.ts b/web/src/admin/flows/FlowImportForm.ts
similarity index 82%
rename from web/src/pages/flows/FlowImportForm.ts
rename to web/src/admin/flows/FlowImportForm.ts
index 16feae700..d1060cee5 100644
--- a/web/src/pages/flows/FlowImportForm.ts
+++ b/web/src/admin/flows/FlowImportForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/admin/flows/FlowListPage.ts
similarity index 86%
rename from web/src/pages/flows/FlowListPage.ts
rename to web/src/admin/flows/FlowListPage.ts
index a0fff333f..9a63024d1 100644
--- a/web/src/pages/flows/FlowListPage.ts
+++ b/web/src/admin/flows/FlowListPage.ts
@@ -1,16 +1,16 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/flows/FlowForm";
-import "@goauthentik/web/pages/flows/FlowImportForm";
-import { DesignationToLabel } from "@goauthentik/web/pages/flows/utils";
-import { groupBy } from "@goauthentik/web/utils";
+import "@goauthentik/admin/flows/FlowForm";
+import "@goauthentik/admin/flows/FlowImportForm";
+import { DesignationToLabel } from "@goauthentik/admin/flows/utils";
+import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/ConfirmationForm";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -39,7 +39,7 @@ export class FlowListPage extends TablePage<Flow> {
     @property()
     order = "slug";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Flow>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Flow>> {
         return new FlowsApi(DEFAULT_CONFIG).flowsInstancesList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/admin/flows/FlowViewPage.ts
similarity index 95%
rename from web/src/pages/flows/FlowViewPage.ts
rename to web/src/admin/flows/FlowViewPage.ts
index f9ad8872f..75cdfcdf6 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/admin/flows/FlowViewPage.ts
@@ -1,19 +1,20 @@
-import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/flows/BoundStagesList";
-import "@goauthentik/web/pages/flows/FlowDiagram";
-import "@goauthentik/web/pages/flows/FlowForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
+import "@goauthentik/admin/flows/BoundStagesList";
+import "@goauthentik/admin/flows/FlowDiagram";
+import "@goauthentik/admin/flows/FlowForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -25,7 +26,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { Flow, FlowsApi, ResponseError } from "@goauthentik/api";
 
 @customElement("ak-flow-view")
-export class FlowViewPage extends LitElement {
+export class FlowViewPage extends AKElement {
     @property()
     set flowSlug(value: string) {
         new FlowsApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/flows/StageBindingForm.ts b/web/src/admin/flows/StageBindingForm.ts
similarity index 97%
rename from web/src/pages/flows/StageBindingForm.ts
rename to web/src/admin/flows/StageBindingForm.ts
index 811d57fce..0aa6aec1a 100644
--- a/web/src/pages/flows/StageBindingForm.ts
+++ b/web/src/admin/flows/StageBindingForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first, groupBy } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first, groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/flows/utils.ts b/web/src/admin/flows/utils.ts
similarity index 100%
rename from web/src/pages/flows/utils.ts
rename to web/src/admin/flows/utils.ts
diff --git a/web/src/pages/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts
similarity index 93%
rename from web/src/pages/groups/GroupForm.ts
rename to web/src/admin/groups/GroupForm.ts
index bdd2080c5..ccc5b03da 100644
--- a/web/src/pages/groups/GroupForm.ts
+++ b/web/src/admin/groups/GroupForm.ts
@@ -1,12 +1,12 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/chips/Chip";
-import "@goauthentik/web/elements/chips/ChipGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
-import "@goauthentik/web/pages/groups/MemberSelectModal";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/admin/groups/MemberSelectModal";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/chips/Chip";
+import "@goauthentik/elements/chips/ChipGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import { UserOption } from "@goauthentik/elements/user/utils";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/groups/GroupListPage.ts b/web/src/admin/groups/GroupListPage.ts
similarity index 83%
rename from web/src/pages/groups/GroupListPage.ts
rename to web/src/admin/groups/GroupListPage.ts
index f6a2cee53..12cf92f48 100644
--- a/web/src/pages/groups/GroupListPage.ts
+++ b/web/src/admin/groups/GroupListPage.ts
@@ -1,13 +1,13 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/groups/GroupForm";
+import "@goauthentik/admin/groups/GroupForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -35,7 +35,7 @@ export class GroupListPage extends TablePage<Group> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Group>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
         return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/groups/GroupViewPage.ts b/web/src/admin/groups/GroupViewPage.ts
similarity index 88%
rename from web/src/pages/groups/GroupViewPage.ts
rename to web/src/admin/groups/GroupViewPage.ts
index 448512a3d..9238ba410 100644
--- a/web/src/pages/groups/GroupViewPage.ts
+++ b/web/src/admin/groups/GroupViewPage.ts
@@ -1,22 +1,23 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/groups/GroupForm";
-import "@goauthentik/web/pages/users/RelatedUserList";
+import "@goauthentik/admin/groups/GroupForm";
+import "@goauthentik/admin/users/RelatedUserList";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -31,7 +32,7 @@ import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import { CoreApi, Group } from "@goauthentik/api";
 
 @customElement("ak-group-view")
-export class GroupViewPage extends LitElement {
+export class GroupViewPage extends AKElement {
     @property({ type: String })
     set groupId(id: string) {
         new CoreApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/groups/MemberSelectModal.ts b/web/src/admin/groups/MemberSelectModal.ts
similarity index 82%
rename from web/src/pages/groups/MemberSelectModal.ts
rename to web/src/admin/groups/MemberSelectModal.ts
index bc103f163..599505534 100644
--- a/web/src/pages/groups/MemberSelectModal.ts
+++ b/web/src/admin/groups/MemberSelectModal.ts
@@ -1,11 +1,11 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TableModal } from "@goauthentik/web/elements/table/TableModal";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { first } from "@goauthentik/common/utils";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TableModal } from "@goauthentik/elements/table/TableModal";
 
 import { t } from "@lingui/macro";
 
@@ -28,7 +28,7 @@ export class MemberSelectTable extends TableModal<User> {
 
     order = "username";
 
-    async apiEndpoint(page: number): Promise<AKResponse<User>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<User>> {
         return new CoreApi(DEFAULT_CONFIG).coreUsersList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/groups/RelatedGroupList.ts b/web/src/admin/groups/RelatedGroupList.ts
similarity index 81%
rename from web/src/pages/groups/RelatedGroupList.ts
rename to web/src/admin/groups/RelatedGroupList.ts
index b852f8f0a..ee48b84bc 100644
--- a/web/src/pages/groups/RelatedGroupList.ts
+++ b/web/src/admin/groups/RelatedGroupList.ts
@@ -1,12 +1,12 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/pages/groups/GroupForm";
+import "@goauthentik/admin/groups/GroupForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -28,7 +28,7 @@ export class RelatedGroupList extends Table<Group> {
     @property({ type: Number })
     targetUser?: number;
 
-    async apiEndpoint(page: number): Promise<AKResponse<Group>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
         return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/outposts/OutpostDeploymentModal.ts b/web/src/admin/outposts/OutpostDeploymentModal.ts
similarity index 96%
rename from web/src/pages/outposts/OutpostDeploymentModal.ts
rename to web/src/admin/outposts/OutpostDeploymentModal.ts
index e3dd1c92f..45bce1712 100644
--- a/web/src/pages/outposts/OutpostDeploymentModal.ts
+++ b/web/src/admin/outposts/OutpostDeploymentModal.ts
@@ -1,5 +1,5 @@
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/TokenCopyButton";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/TokenCopyButton";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts
similarity index 97%
rename from web/src/pages/outposts/OutpostForm.ts
rename to web/src/admin/outposts/OutpostForm.ts
index 07e3e8e8a..dc5fb12e1 100644
--- a/web/src/pages/outposts/OutpostForm.ts
+++ b/web/src/admin/outposts/OutpostForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/outposts/OutpostHealth.ts b/web/src/admin/outposts/OutpostHealth.ts
similarity index 83%
rename from web/src/pages/outposts/OutpostHealth.ts
rename to web/src/admin/outposts/OutpostHealth.ts
index f92ad552c..a7480b4f9 100644
--- a/web/src/pages/outposts/OutpostHealth.ts
+++ b/web/src/admin/outposts/OutpostHealth.ts
@@ -1,18 +1,19 @@
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/Spinner";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/Spinner";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import { OutpostHealth } from "@goauthentik/api";
 
 @customElement("ak-outpost-health")
-export class OutpostHealthElement extends LitElement {
+export class OutpostHealthElement extends AKElement {
     @property({ attribute: false })
     outpostHealth?: OutpostHealth;
 
diff --git a/web/src/pages/outposts/OutpostHealthSimple.ts b/web/src/admin/outposts/OutpostHealthSimple.ts
similarity index 77%
rename from web/src/pages/outposts/OutpostHealthSimple.ts
rename to web/src/admin/outposts/OutpostHealthSimple.ts
index 3b34f06e1..96a101b3b 100644
--- a/web/src/pages/outposts/OutpostHealthSimple.ts
+++ b/web/src/admin/outposts/OutpostHealthSimple.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/Spinner";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/Spinner";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import { OutpostHealth, OutpostsApi } from "@goauthentik/api";
 
 @customElement("ak-outpost-health-simple")
-export class OutpostHealthSimpleElement extends LitElement {
+export class OutpostHealthSimpleElement extends AKElement {
     @property()
     outpostId?: string;
 
diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/admin/outposts/OutpostListPage.ts
similarity index 88%
rename from web/src/pages/outposts/OutpostListPage.ts
rename to web/src/admin/outposts/OutpostListPage.ts
index 8eddfcf5e..aaaf9f060 100644
--- a/web/src/pages/outposts/OutpostListPage.ts
+++ b/web/src/admin/outposts/OutpostListPage.ts
@@ -1,16 +1,17 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/outposts/OutpostDeploymentModal";
-import "@goauthentik/web/pages/outposts/OutpostForm";
-import "@goauthentik/web/pages/outposts/OutpostHealth";
-import "@goauthentik/web/pages/outposts/OutpostHealthSimple";
+import "@goauthentik/admin/outposts/OutpostDeploymentModal";
+import "@goauthentik/admin/outposts/OutpostDeploymentModal";
+import "@goauthentik/admin/outposts/OutpostForm";
+import "@goauthentik/admin/outposts/OutpostHealth";
+import "@goauthentik/admin/outposts/OutpostHealthSimple";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -50,7 +51,7 @@ export class OutpostListPage extends TablePage<Outpost> {
     searchEnabled(): boolean {
         return true;
     }
-    async apiEndpoint(page: number): Promise<AKResponse<Outpost>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Outpost>> {
         return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/outposts/ServiceConnectionDockerForm.ts b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
similarity index 96%
rename from web/src/pages/outposts/ServiceConnectionDockerForm.ts
rename to web/src/admin/outposts/ServiceConnectionDockerForm.ts
index 15c4e82bc..860339fe3 100644
--- a/web/src/pages/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionDockerForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
similarity index 91%
rename from web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
rename to web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
index 5a8e11711..7b1daed75 100644
--- a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/outposts/ServiceConnectionListPage.ts b/web/src/admin/outposts/ServiceConnectionListPage.ts
similarity index 81%
rename from web/src/pages/outposts/ServiceConnectionListPage.ts
rename to web/src/admin/outposts/ServiceConnectionListPage.ts
index 8171dfe06..6225ff822 100644
--- a/web/src/pages/outposts/ServiceConnectionListPage.ts
+++ b/web/src/admin/outposts/ServiceConnectionListPage.ts
@@ -1,17 +1,17 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/outposts/OutpostHealth";
-import "@goauthentik/web/pages/outposts/ServiceConnectionDockerForm";
-import "@goauthentik/web/pages/outposts/ServiceConnectionKubernetesForm";
-import "@goauthentik/web/pages/outposts/ServiceConnectionWizard";
+import "@goauthentik/admin/outposts/OutpostHealth";
+import "@goauthentik/admin/outposts/ServiceConnectionDockerForm";
+import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm";
+import "@goauthentik/admin/outposts/ServiceConnectionWizard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -39,7 +39,7 @@ export class OutpostServiceConnectionListPage extends TablePage<ServiceConnectio
 
     checkbox = true;
 
-    async apiEndpoint(page: number): Promise<AKResponse<ServiceConnection>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<ServiceConnection>> {
         return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/outposts/ServiceConnectionWizard.ts b/web/src/admin/outposts/ServiceConnectionWizard.ts
similarity index 84%
rename from web/src/pages/outposts/ServiceConnectionWizard.ts
rename to web/src/admin/outposts/ServiceConnectionWizard.ts
index 01c7c96cf..417538a1c 100644
--- a/web/src/pages/outposts/ServiceConnectionWizard.ts
+++ b/web/src/admin/outposts/ServiceConnectionWizard.ts
@@ -1,18 +1,19 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/outposts/ServiceConnectionDockerForm";
-import "@goauthentik/web/pages/outposts/ServiceConnectionKubernetesForm";
+import "@goauthentik/admin/outposts/ServiceConnectionDockerForm";
+import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@@ -58,7 +59,7 @@ export class InitialServiceConnectionWizardPage extends WizardPage {
 }
 
 @customElement("ak-service-connection-wizard")
-export class ServiceConnectionWizard extends LitElement {
+export class ServiceConnectionWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/admin/policies/BoundPoliciesList.ts
similarity index 89%
rename from web/src/pages/policies/BoundPoliciesList.ts
rename to web/src/admin/policies/BoundPoliciesList.ts
index a8d470734..8779bc212 100644
--- a/web/src/pages/policies/BoundPoliciesList.ts
+++ b/web/src/admin/policies/BoundPoliciesList.ts
@@ -1,17 +1,17 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/pages/groups/GroupForm";
-import "@goauthentik/web/pages/policies/PolicyBindingForm";
-import "@goauthentik/web/pages/policies/PolicyWizard";
-import "@goauthentik/web/pages/users/UserForm";
+import "@goauthentik/admin/groups/GroupForm";
+import "@goauthentik/admin/policies/PolicyBindingForm";
+import "@goauthentik/admin/policies/PolicyWizard";
+import "@goauthentik/admin/users/UserForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -31,7 +31,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
 
     checkbox = true;
 
-    async apiEndpoint(page: number): Promise<AKResponse<PolicyBinding>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<PolicyBinding>> {
         return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsList({
             target: this.target || "",
             ordering: "order",
diff --git a/web/src/pages/policies/PolicyBindingForm.ts b/web/src/admin/policies/PolicyBindingForm.ts
similarity index 97%
rename from web/src/pages/policies/PolicyBindingForm.ts
rename to web/src/admin/policies/PolicyBindingForm.ts
index 877fe00b6..b604ee881 100644
--- a/web/src/pages/policies/PolicyBindingForm.ts
+++ b/web/src/admin/policies/PolicyBindingForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/SearchSelect";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
-import { first, groupBy } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first, groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/SearchSelect";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import { UserOption } from "@goauthentik/elements/user/utils";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/PolicyListPage.ts b/web/src/admin/policies/PolicyListPage.ts
similarity index 79%
rename from web/src/pages/policies/PolicyListPage.ts
rename to web/src/admin/policies/PolicyListPage.ts
index 1847a39ce..8629f690f 100644
--- a/web/src/pages/policies/PolicyListPage.ts
+++ b/web/src/admin/policies/PolicyListPage.ts
@@ -1,22 +1,22 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/ConfirmationForm";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/policies/PolicyTestForm";
-import "@goauthentik/web/pages/policies/PolicyWizard";
-import "@goauthentik/web/pages/policies/dummy/DummyPolicyForm";
-import "@goauthentik/web/pages/policies/event_matcher/EventMatcherPolicyForm";
-import "@goauthentik/web/pages/policies/expiry/ExpiryPolicyForm";
-import "@goauthentik/web/pages/policies/expression/ExpressionPolicyForm";
-import "@goauthentik/web/pages/policies/hibp/HaveIBeenPwnedPolicyForm";
-import "@goauthentik/web/pages/policies/password/PasswordPolicyForm";
-import "@goauthentik/web/pages/policies/reputation/ReputationPolicyForm";
-import { groupBy } from "@goauthentik/web/utils";
+import "@goauthentik/admin/policies/PolicyTestForm";
+import "@goauthentik/admin/policies/PolicyWizard";
+import "@goauthentik/admin/policies/dummy/DummyPolicyForm";
+import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm";
+import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm";
+import "@goauthentik/admin/policies/expression/ExpressionPolicyForm";
+import "@goauthentik/admin/policies/hibp/HaveIBeenPwnedPolicyForm";
+import "@goauthentik/admin/policies/password/PasswordPolicyForm";
+import "@goauthentik/admin/policies/reputation/ReputationPolicyForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/ConfirmationForm";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -46,7 +46,7 @@ export class PolicyListPage extends TablePage<Policy> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Policy>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Policy>> {
         return new PoliciesApi(DEFAULT_CONFIG).policiesAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/policies/PolicyTestForm.ts b/web/src/admin/policies/PolicyTestForm.ts
similarity index 93%
rename from web/src/pages/policies/PolicyTestForm.ts
rename to web/src/admin/policies/PolicyTestForm.ts
index 4771be95c..f7286f576 100644
--- a/web/src/pages/policies/PolicyTestForm.ts
+++ b/web/src/admin/policies/PolicyTestForm.ts
@@ -1,10 +1,10 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import { PFColor } from "@goauthentik/elements/Label";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { UserOption } from "@goauthentik/elements/user/utils";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/policies/PolicyWizard.ts b/web/src/admin/policies/PolicyWizard.ts
similarity index 77%
rename from web/src/pages/policies/PolicyWizard.ts
rename to web/src/admin/policies/PolicyWizard.ts
index ad07ffe8b..a7b063701 100644
--- a/web/src/pages/policies/PolicyWizard.ts
+++ b/web/src/admin/policies/PolicyWizard.ts
@@ -1,23 +1,24 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/policies/dummy/DummyPolicyForm";
-import "@goauthentik/web/pages/policies/event_matcher/EventMatcherPolicyForm";
-import "@goauthentik/web/pages/policies/expiry/ExpiryPolicyForm";
-import "@goauthentik/web/pages/policies/expression/ExpressionPolicyForm";
-import "@goauthentik/web/pages/policies/hibp/HaveIBeenPwnedPolicyForm";
-import "@goauthentik/web/pages/policies/password/PasswordPolicyForm";
-import "@goauthentik/web/pages/policies/reputation/ReputationPolicyForm";
+import "@goauthentik/admin/policies/dummy/DummyPolicyForm";
+import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm";
+import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm";
+import "@goauthentik/admin/policies/expression/ExpressionPolicyForm";
+import "@goauthentik/admin/policies/hibp/HaveIBeenPwnedPolicyForm";
+import "@goauthentik/admin/policies/password/PasswordPolicyForm";
+import "@goauthentik/admin/policies/reputation/ReputationPolicyForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@@ -63,7 +64,7 @@ export class InitialPolicyWizardPage extends WizardPage {
 }
 
 @customElement("ak-policy-wizard")
-export class PolicyWizard extends LitElement {
+export class PolicyWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts
similarity index 93%
rename from web/src/pages/policies/dummy/DummyPolicyForm.ts
rename to web/src/admin/policies/dummy/DummyPolicyForm.ts
index 95187efd8..eb452b729 100644
--- a/web/src/pages/policies/dummy/DummyPolicyForm.ts
+++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
similarity index 95%
rename from web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
rename to web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
index eddfa41ca..120a2a8b2 100644
--- a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
+++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
similarity index 93%
rename from web/src/pages/policies/expiry/ExpiryPolicyForm.ts
rename to web/src/admin/policies/expiry/ExpiryPolicyForm.ts
index 06b32e5e2..440d1a4e7 100644
--- a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
+++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
similarity index 91%
rename from web/src/pages/policies/expression/ExpressionPolicyForm.ts
rename to web/src/admin/policies/expression/ExpressionPolicyForm.ts
index 2463af900..a14ac1918 100644
--- a/web/src/pages/policies/expression/ExpressionPolicyForm.ts
+++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts b/web/src/admin/policies/hibp/HaveIBeenPwnedPolicyForm.ts
similarity index 93%
rename from web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
rename to web/src/admin/policies/hibp/HaveIBeenPwnedPolicyForm.ts
index fd903ccb4..79b56e6e7 100644
--- a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
+++ b/web/src/admin/policies/hibp/HaveIBeenPwnedPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts
similarity index 96%
rename from web/src/pages/policies/password/PasswordPolicyForm.ts
rename to web/src/admin/policies/password/PasswordPolicyForm.ts
index b3fb8ff2e..884e38121 100644
--- a/web/src/pages/policies/password/PasswordPolicyForm.ts
+++ b/web/src/admin/policies/password/PasswordPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/policies/reputation/ReputationListPage.ts b/web/src/admin/policies/reputation/ReputationListPage.ts
similarity index 80%
rename from web/src/pages/policies/reputation/ReputationListPage.ts
rename to web/src/admin/policies/reputation/ReputationListPage.ts
index 51e8000c5..65fd44176 100644
--- a/web/src/pages/policies/reputation/ReputationListPage.ts
+++ b/web/src/admin/policies/reputation/ReputationListPage.ts
@@ -1,12 +1,12 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 import getUnicodeFlagIcon from "country-flag-icons/unicode";
 
 import { t } from "@lingui/macro";
@@ -36,7 +36,7 @@ export class ReputationListPage extends TablePage<Reputation> {
 
     checkbox = true;
 
-    async apiEndpoint(page: number): Promise<AKResponse<Reputation>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Reputation>> {
         return new PoliciesApi(DEFAULT_CONFIG).policiesReputationScoresList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/policies/reputation/ReputationPolicyForm.ts b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
similarity index 94%
rename from web/src/pages/policies/reputation/ReputationPolicyForm.ts
rename to web/src/admin/policies/reputation/ReputationPolicyForm.ts
index d27980b58..eea94a185 100644
--- a/web/src/pages/policies/reputation/ReputationPolicyForm.ts
+++ b/web/src/admin/policies/reputation/ReputationPolicyForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
similarity index 92%
rename from web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
rename to web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
index dbafb8c85..ce10c79db 100644
--- a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/property-mappings/PropertyMappingListPage.ts b/web/src/admin/property-mappings/PropertyMappingListPage.ts
similarity index 82%
rename from web/src/pages/property-mappings/PropertyMappingListPage.ts
rename to web/src/admin/property-mappings/PropertyMappingListPage.ts
index d85f5009d..f87311452 100644
--- a/web/src/pages/property-mappings/PropertyMappingListPage.ts
+++ b/web/src/admin/property-mappings/PropertyMappingListPage.ts
@@ -1,19 +1,19 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingLDAPForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingNotification";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingSAMLForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingScopeForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingTestForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingWizard";
-import { groupBy } from "@goauthentik/web/utils";
+import "@goauthentik/admin/property-mappings/PropertyMappingLDAPForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
+import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingWizard";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -46,7 +46,7 @@ export class PropertyMappingListPage extends TablePage<PropertyMapping> {
     @property({ type: Boolean })
     hideManaged = getURLParam<boolean>("hideManaged", true);
 
-    async apiEndpoint(page: number): Promise<AKResponse<PropertyMapping>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<PropertyMapping>> {
         return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts
similarity index 91%
rename from web/src/pages/property-mappings/PropertyMappingNotification.ts
rename to web/src/admin/property-mappings/PropertyMappingNotification.ts
index cd0e29e90..d3037aef6 100644
--- a/web/src/pages/property-mappings/PropertyMappingNotification.ts
+++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
similarity index 93%
rename from web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
rename to web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
index 9bd2fbade..4368e8b07 100644
--- a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts
similarity index 93%
rename from web/src/pages/property-mappings/PropertyMappingScopeForm.ts
rename to web/src/admin/property-mappings/PropertyMappingScopeForm.ts
index 95b138122..1cdb24faf 100644
--- a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingScopeForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts
similarity index 90%
rename from web/src/pages/property-mappings/PropertyMappingTestForm.ts
rename to web/src/admin/property-mappings/PropertyMappingTestForm.ts
index 6872e06f8..616730a26 100644
--- a/web/src/pages/property-mappings/PropertyMappingTestForm.ts
+++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { UserOption } from "@goauthentik/elements/user/utils";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/property-mappings/PropertyMappingWizard.ts b/web/src/admin/property-mappings/PropertyMappingWizard.ts
similarity index 79%
rename from web/src/pages/property-mappings/PropertyMappingWizard.ts
rename to web/src/admin/property-mappings/PropertyMappingWizard.ts
index 4daeed20b..60f3364bb 100644
--- a/web/src/pages/property-mappings/PropertyMappingWizard.ts
+++ b/web/src/admin/property-mappings/PropertyMappingWizard.ts
@@ -1,21 +1,22 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingLDAPForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingNotification";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingSAMLForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingScopeForm";
-import "@goauthentik/web/pages/property-mappings/PropertyMappingTestForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingLDAPForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
+import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@@ -61,7 +62,7 @@ export class InitialPropertyMappingWizardPage extends WizardPage {
 }
 
 @customElement("ak-property-mapping-wizard")
-export class PropertyMappingWizard extends LitElement {
+export class PropertyMappingWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/providers/ProviderListPage.ts b/web/src/admin/providers/ProviderListPage.ts
similarity index 78%
rename from web/src/pages/providers/ProviderListPage.ts
rename to web/src/admin/providers/ProviderListPage.ts
index 40827c839..96cc71b1f 100644
--- a/web/src/pages/providers/ProviderListPage.ts
+++ b/web/src/admin/providers/ProviderListPage.ts
@@ -1,17 +1,17 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/providers/ProviderWizard";
-import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm";
-import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderForm";
-import "@goauthentik/web/pages/providers/proxy/ProxyProviderForm";
-import "@goauthentik/web/pages/providers/saml/SAMLProviderForm";
+import "@goauthentik/admin/providers/ProviderWizard";
+import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
+import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
+import "@goauthentik/admin/providers/proxy/ProxyProviderForm";
+import "@goauthentik/admin/providers/saml/SAMLProviderForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -40,7 +40,7 @@ export class ProviderListPage extends TablePage<Provider> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Provider>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Provider>> {
         return new ProvidersApi(DEFAULT_CONFIG).providersAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/providers/ProviderViewPage.ts b/web/src/admin/providers/ProviderViewPage.ts
similarity index 81%
rename from web/src/pages/providers/ProviderViewPage.ts
rename to web/src/admin/providers/ProviderViewPage.ts
index bc906a927..9631d3ba2 100644
--- a/web/src/pages/providers/ProviderViewPage.ts
+++ b/web/src/admin/providers/ProviderViewPage.ts
@@ -1,25 +1,26 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/pages/providers/ldap/LDAPProviderViewPage";
-import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderViewPage";
-import "@goauthentik/web/pages/providers/proxy/ProxyProviderViewPage";
-import "@goauthentik/web/pages/providers/saml/SAMLProviderViewPage";
+import "@goauthentik/admin/providers/ldap/LDAPProviderViewPage";
+import "@goauthentik/admin/providers/oauth2/OAuth2ProviderViewPage";
+import "@goauthentik/admin/providers/proxy/ProxyProviderViewPage";
+import "@goauthentik/admin/providers/saml/SAMLProviderViewPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/buttons/SpinnerButton";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 
 import { Provider, ProvidersApi } from "@goauthentik/api";
 
 @customElement("ak-provider-view")
-export class ProviderViewPage extends LitElement {
+export class ProviderViewPage extends AKElement {
     @property({ type: Number })
     set providerID(value: number) {
         new ProvidersApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/providers/ProviderWizard.ts b/web/src/admin/providers/ProviderWizard.ts
similarity index 82%
rename from web/src/pages/providers/ProviderWizard.ts
rename to web/src/admin/providers/ProviderWizard.ts
index 69e8dc0f7..c2ffff4fd 100644
--- a/web/src/pages/providers/ProviderWizard.ts
+++ b/web/src/admin/providers/ProviderWizard.ts
@@ -1,22 +1,23 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { paramURL } from "@goauthentik/web/elements/router/RouterOutlet";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm";
-import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderForm";
-import "@goauthentik/web/pages/providers/proxy/ProxyProviderForm";
-import "@goauthentik/web/pages/providers/saml/SAMLProviderForm";
-import "@goauthentik/web/pages/providers/saml/SAMLProviderImportForm";
+import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
+import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
+import "@goauthentik/admin/providers/proxy/ProxyProviderForm";
+import "@goauthentik/admin/providers/saml/SAMLProviderForm";
+import "@goauthentik/admin/providers/saml/SAMLProviderImportForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import { paramURL } from "@goauthentik/elements/router/RouterOutlet";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFHint from "@patternfly/patternfly/components/Hint/hint.css";
@@ -77,7 +78,7 @@ export class InitialProviderWizardPage extends WizardPage {
 }
 
 @customElement("ak-provider-wizard")
-export class ProviderWizard extends LitElement {
+export class ProviderWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/providers/RelatedApplicationButton.ts b/web/src/admin/providers/RelatedApplicationButton.ts
similarity index 78%
rename from web/src/pages/providers/RelatedApplicationButton.ts
rename to web/src/admin/providers/RelatedApplicationButton.ts
index cb2a2b5f0..40422003a 100644
--- a/web/src/pages/providers/RelatedApplicationButton.ts
+++ b/web/src/admin/providers/RelatedApplicationButton.ts
@@ -1,10 +1,11 @@
-import "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/applications/ApplicationForm";
+import "@goauthentik/admin/applications/ApplicationForm";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
@@ -13,7 +14,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { Provider } from "@goauthentik/api";
 
 @customElement("ak-provider-related-application")
-export class RelatedApplicationButton extends LitElement {
+export class RelatedApplicationButton extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton];
     }
diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts
similarity index 97%
rename from web/src/pages/providers/ldap/LDAPProviderForm.ts
rename to web/src/admin/providers/ldap/LDAPProviderForm.ts
index 934563ae1..106de1349 100644
--- a/web/src/pages/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts
similarity index 92%
rename from web/src/pages/providers/ldap/LDAPProviderViewPage.ts
rename to web/src/admin/providers/ldap/LDAPProviderViewPage.ts
index f34a72fab..d094bd3de 100644
--- a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts
+++ b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts
@@ -1,22 +1,23 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/providers/RelatedApplicationButton";
-import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm";
+import "@goauthentik/admin/providers/RelatedApplicationButton";
+import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { until } from "lit-html/directives/until.js";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -32,7 +33,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { LDAPProvider, ProvidersApi } from "@goauthentik/api";
 
 @customElement("ak-provider-ldap-view")
-export class LDAPProviderViewPage extends LitElement {
+export class LDAPProviderViewPage extends AKElement {
     @property()
     set args(value: { [key: string]: number }) {
         this.providerID = value.id;
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
similarity index 98%
rename from web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
rename to web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
index c00032e47..92f2e5ea0 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
-import { first, randomString } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first, randomString } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts
similarity index 94%
rename from web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
rename to web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts
index 5f99080b0..e086f2b18 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
+++ b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/providers/RelatedApplicationButton";
-import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderForm";
-import { convertToTitle } from "@goauthentik/web/utils";
+import "@goauthentik/admin/providers/RelatedApplicationButton";
+import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { convertToTitle } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -29,7 +30,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { OAuth2Provider, OAuth2ProviderSetupURLs, ProvidersApi } from "@goauthentik/api";
 
 @customElement("ak-provider-oauth2-view")
-export class OAuth2ProviderViewPage extends LitElement {
+export class OAuth2ProviderViewPage extends AKElement {
     @property({ type: Number })
     set providerID(value: number) {
         const api = new ProvidersApi(DEFAULT_CONFIG);
diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts
similarity index 98%
rename from web/src/pages/providers/proxy/ProxyProviderForm.ts
rename to web/src/admin/providers/proxy/ProxyProviderForm.ts
index 6f6fcbe49..71acf99aa 100644
--- a/web/src/pages/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts
similarity index 93%
rename from web/src/pages/providers/proxy/ProxyProviderViewPage.ts
rename to web/src/admin/providers/proxy/ProxyProviderViewPage.ts
index 1af0babab..31b61a5b5 100644
--- a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts
+++ b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts
@@ -1,3 +1,8 @@
+import "@goauthentik/admin/providers/RelatedApplicationButton";
+import "@goauthentik/admin/providers/proxy/ProxyProviderForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { convertToSlug } from "@goauthentik/common/utils";
 import MDCaddyStandalone from "@goauthentik/docs/providers/proxy/_caddy_standalone.md";
 import MDNginxIngress from "@goauthentik/docs/providers/proxy/_nginx_ingress.md";
 import MDNginxPM from "@goauthentik/docs/providers/proxy/_nginx_proxy_manager.md";
@@ -5,26 +10,22 @@ import MDNginxStandalone from "@goauthentik/docs/providers/proxy/_nginx_standalo
 import MDTraefikCompose from "@goauthentik/docs/providers/proxy/_traefik_compose.md";
 import MDTraefikIngress from "@goauthentik/docs/providers/proxy/_traefik_ingress.md";
 import MDTraefikStandalone from "@goauthentik/docs/providers/proxy/_traefik_standalone.md";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import { MarkdownDocument } from "@goauthentik/web/elements/Markdown";
-import "@goauthentik/web/elements/Markdown";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/providers/RelatedApplicationButton";
-import "@goauthentik/web/pages/providers/proxy/ProxyProviderForm";
-import { convertToSlug } from "@goauthentik/web/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import { PFColor } from "@goauthentik/elements/Label";
+import { MarkdownDocument } from "@goauthentik/elements/Markdown";
+import "@goauthentik/elements/Markdown";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -61,7 +62,7 @@ export function isForward(mode: ProxyMode): boolean {
 }
 
 @customElement("ak-provider-proxy-view")
-export class ProxyProviderViewPage extends LitElement {
+export class ProxyProviderViewPage extends AKElement {
     @property()
     set args(value: { [key: string]: number }) {
         this.providerID = value.id;
diff --git a/web/src/pages/providers/saml/SAMLProviderForm.ts b/web/src/admin/providers/saml/SAMLProviderForm.ts
similarity index 98%
rename from web/src/pages/providers/saml/SAMLProviderForm.ts
rename to web/src/admin/providers/saml/SAMLProviderForm.ts
index 0dfc2d5f8..5d34d3b3d 100644
--- a/web/src/pages/providers/saml/SAMLProviderForm.ts
+++ b/web/src/admin/providers/saml/SAMLProviderForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/providers/saml/SAMLProviderImportForm.ts b/web/src/admin/providers/saml/SAMLProviderImportForm.ts
similarity index 91%
rename from web/src/pages/providers/saml/SAMLProviderImportForm.ts
rename to web/src/admin/providers/saml/SAMLProviderImportForm.ts
index ef36ac753..364018d32 100644
--- a/web/src/pages/providers/saml/SAMLProviderImportForm.ts
+++ b/web/src/admin/providers/saml/SAMLProviderImportForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts
similarity index 94%
rename from web/src/pages/providers/saml/SAMLProviderViewPage.ts
rename to web/src/admin/providers/saml/SAMLProviderViewPage.ts
index 6c97ceb3a..b803f55fe 100644
--- a/web/src/pages/providers/saml/SAMLProviderViewPage.ts
+++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts
@@ -1,22 +1,23 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/pages/providers/RelatedApplicationButton";
-import "@goauthentik/web/pages/providers/saml/SAMLProviderForm";
+import "@goauthentik/admin/providers/RelatedApplicationButton";
+import "@goauthentik/admin/providers/saml/SAMLProviderForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -31,7 +32,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { CryptoApi, ProvidersApi, SAMLProvider } from "@goauthentik/api";
 
 @customElement("ak-provider-saml-view")
-export class SAMLProviderViewPage extends LitElement {
+export class SAMLProviderViewPage extends AKElement {
     @property()
     set args(value: { [key: string]: number }) {
         this.providerID = value.id;
diff --git a/web/src/pages/sources/SourceListPage.ts b/web/src/admin/sources/SourceListPage.ts
similarity index 80%
rename from web/src/pages/sources/SourceListPage.ts
rename to web/src/admin/sources/SourceListPage.ts
index 2e3dfc99b..1e82b820e 100644
--- a/web/src/pages/sources/SourceListPage.ts
+++ b/web/src/admin/sources/SourceListPage.ts
@@ -1,16 +1,16 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/sources/SourceWizard";
-import "@goauthentik/web/pages/sources/ldap/LDAPSourceForm";
-import "@goauthentik/web/pages/sources/oauth/OAuthSourceForm";
-import "@goauthentik/web/pages/sources/plex/PlexSourceForm";
-import "@goauthentik/web/pages/sources/saml/SAMLSourceForm";
+import "@goauthentik/admin/sources/SourceWizard";
+import "@goauthentik/admin/sources/ldap/LDAPSourceForm";
+import "@goauthentik/admin/sources/oauth/OAuthSourceForm";
+import "@goauthentik/admin/sources/plex/PlexSourceForm";
+import "@goauthentik/admin/sources/saml/SAMLSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -40,7 +40,7 @@ export class SourceListPage extends TablePage<Source> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Source>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Source>> {
         return new SourcesApi(DEFAULT_CONFIG).sourcesAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/admin/sources/SourceViewPage.ts
similarity index 76%
rename from web/src/pages/sources/SourceViewPage.ts
rename to web/src/admin/sources/SourceViewPage.ts
index 5534814df..d0050fdf9 100644
--- a/web/src/pages/sources/SourceViewPage.ts
+++ b/web/src/admin/sources/SourceViewPage.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/PageHeader";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/pages/sources/ldap/LDAPSourceViewPage";
-import "@goauthentik/web/pages/sources/oauth/OAuthSourceViewPage";
-import "@goauthentik/web/pages/sources/plex/PlexSourceViewPage";
-import "@goauthentik/web/pages/sources/saml/SAMLSourceViewPage";
+import "@goauthentik/admin/sources/ldap/LDAPSourceViewPage";
+import "@goauthentik/admin/sources/oauth/OAuthSourceViewPage";
+import "@goauthentik/admin/sources/plex/PlexSourceViewPage";
+import "@goauthentik/admin/sources/saml/SAMLSourceViewPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/PageHeader";
+import "@goauthentik/elements/buttons/SpinnerButton";
 
-import { LitElement, TemplateResult, html } from "lit";
+import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
 import { Source, SourcesApi } from "@goauthentik/api";
 
 @customElement("ak-source-view")
-export class SourceViewPage extends LitElement {
+export class SourceViewPage extends AKElement {
     @property({ type: String })
     set sourceSlug(slug: string) {
         new SourcesApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/sources/SourceWizard.ts b/web/src/admin/sources/SourceWizard.ts
similarity index 82%
rename from web/src/pages/sources/SourceWizard.ts
rename to web/src/admin/sources/SourceWizard.ts
index ba32e605f..271c7b011 100644
--- a/web/src/pages/sources/SourceWizard.ts
+++ b/web/src/admin/sources/SourceWizard.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/sources/ldap/LDAPSourceForm";
-import "@goauthentik/web/pages/sources/oauth/OAuthSourceForm";
-import "@goauthentik/web/pages/sources/plex/PlexSourceForm";
-import "@goauthentik/web/pages/sources/saml/SAMLSourceForm";
+import "@goauthentik/admin/sources/ldap/LDAPSourceForm";
+import "@goauthentik/admin/sources/oauth/OAuthSourceForm";
+import "@goauthentik/admin/sources/plex/PlexSourceForm";
+import "@goauthentik/admin/sources/saml/SAMLSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@@ -60,7 +61,7 @@ export class InitialSourceWizardPage extends WizardPage {
 }
 
 @customElement("ak-source-wizard")
-export class SourceWizard extends LitElement {
+export class SourceWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts
similarity index 98%
rename from web/src/pages/sources/ldap/LDAPSourceForm.ts
rename to web/src/admin/sources/ldap/LDAPSourceForm.ts
index 06b464a82..5509ec339 100644
--- a/web/src/pages/sources/ldap/LDAPSourceForm.ts
+++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/SearchSelect";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/SearchSelect";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts
similarity index 93%
rename from web/src/pages/sources/ldap/LDAPSourceViewPage.ts
rename to web/src/admin/sources/ldap/LDAPSourceViewPage.ts
index a4dfe3e3a..76702b822 100644
--- a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
+++ b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/sources/ldap/LDAPSourceForm";
+import "@goauthentik/admin/sources/ldap/LDAPSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -27,7 +28,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { LDAPSource, SourcesApi, TaskStatusEnum } from "@goauthentik/api";
 
 @customElement("ak-source-ldap-view")
-export class LDAPSourceViewPage extends LitElement {
+export class LDAPSourceViewPage extends AKElement {
     @property({ type: String })
     set sourceSlug(slug: string) {
         new SourcesApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts
similarity index 97%
rename from web/src/pages/sources/oauth/OAuthSourceForm.ts
rename to web/src/admin/sources/oauth/OAuthSourceForm.ts
index a48dd958b..8570c4099 100644
--- a/web/src/pages/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
@@ -65,7 +65,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
     }
 
     send = (data: OAuthSource): Promise<OAuthSource> => {
-        data.providerType = this.providerType?.slug || "";
+        data.providerType = (this.providerType?.slug || "") as ProviderTypeEnum;
         if (this.instance?.slug) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesOauthPartialUpdate({
                 slug: this.instance.slug,
diff --git a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts
similarity index 93%
rename from web/src/pages/sources/oauth/OAuthSourceViewPage.ts
rename to web/src/admin/sources/oauth/OAuthSourceViewPage.ts
index 4ec4263df..f65a17e00 100644
--- a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
+++ b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts
@@ -1,19 +1,20 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
-import "@goauthentik/web/pages/sources/oauth/OAuthSourceForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import "@goauthentik/admin/sources/oauth/OAuthSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -53,7 +54,7 @@ export function ProviderToLabel(provider?: ProviderTypeEnum): string {
 }
 
 @customElement("ak-source-oauth-view")
-export class OAuthSourceViewPage extends LitElement {
+export class OAuthSourceViewPage extends AKElement {
     @property({ type: String })
     set sourceSlug(value: string) {
         new SourcesApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts
similarity index 97%
rename from web/src/pages/sources/plex/PlexSourceForm.ts
rename to web/src/admin/sources/plex/PlexSourceForm.ts
index fe7b1503b..f8f8e9060 100644
--- a/web/src/pages/sources/plex/PlexSourceForm.ts
+++ b/web/src/admin/sources/plex/PlexSourceForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { PlexAPIClient, PlexResource, popupCenterScreen } from "@goauthentik/web/api/Plex";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first, randomString } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { PlexAPIClient, PlexResource, popupCenterScreen } from "@goauthentik/common/helpers/plex";
+import { first, randomString } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/sources/plex/PlexSourceViewPage.ts b/web/src/admin/sources/plex/PlexSourceViewPage.ts
similarity index 88%
rename from web/src/pages/sources/plex/PlexSourceViewPage.ts
rename to web/src/admin/sources/plex/PlexSourceViewPage.ts
index 81a69d81c..b95cf0222 100644
--- a/web/src/pages/sources/plex/PlexSourceViewPage.ts
+++ b/web/src/admin/sources/plex/PlexSourceViewPage.ts
@@ -1,19 +1,20 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
-import "@goauthentik/web/pages/sources/plex/PlexSourceForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import "@goauthentik/admin/sources/plex/PlexSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -25,7 +26,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { PlexSource, SourcesApi } from "@goauthentik/api";
 
 @customElement("ak-source-plex-view")
-export class PlexSourceViewPage extends LitElement {
+export class PlexSourceViewPage extends AKElement {
     @property({ type: String })
     set sourceSlug(value: string) {
         new SourcesApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts
similarity index 98%
rename from web/src/pages/sources/saml/SAMLSourceForm.ts
rename to web/src/admin/sources/saml/SAMLSourceForm.ts
index 31f8a1e24..0913733a3 100644
--- a/web/src/pages/sources/saml/SAMLSourceForm.ts
+++ b/web/src/admin/sources/saml/SAMLSourceForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/sources/saml/SAMLSourceViewPage.ts b/web/src/admin/sources/saml/SAMLSourceViewPage.ts
similarity index 92%
rename from web/src/pages/sources/saml/SAMLSourceViewPage.ts
rename to web/src/admin/sources/saml/SAMLSourceViewPage.ts
index a6d4a78f4..c3a651f0a 100644
--- a/web/src/pages/sources/saml/SAMLSourceViewPage.ts
+++ b/web/src/admin/sources/saml/SAMLSourceViewPage.ts
@@ -1,21 +1,22 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/pages/policies/BoundPoliciesList";
-import "@goauthentik/web/pages/sources/saml/SAMLSourceForm";
+import "@goauthentik/admin/policies/BoundPoliciesList";
+import "@goauthentik/admin/sources/saml/SAMLSourceForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -27,7 +28,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { SAMLSource, SourcesApi } from "@goauthentik/api";
 
 @customElement("ak-source-saml-view")
-export class SAMLSourceViewPage extends LitElement {
+export class SAMLSourceViewPage extends AKElement {
     @property({ type: String })
     set sourceSlug(slug: string) {
         new SourcesApi(DEFAULT_CONFIG)
diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/admin/stages/StageListPage.ts
similarity index 62%
rename from web/src/pages/stages/StageListPage.ts
rename to web/src/admin/stages/StageListPage.ts
index b255a9d4f..039063092 100644
--- a/web/src/pages/stages/StageListPage.ts
+++ b/web/src/admin/stages/StageListPage.ts
@@ -1,32 +1,32 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/stages/StageWizard";
-import "@goauthentik/web/pages/stages/authenticator_duo/AuthenticatorDuoStageForm";
-import "@goauthentik/web/pages/stages/authenticator_sms/AuthenticatorSMSStageForm";
-import "@goauthentik/web/pages/stages/authenticator_static/AuthenticatorStaticStageForm";
-import "@goauthentik/web/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm";
-import "@goauthentik/web/pages/stages/authenticator_validate/AuthenticatorValidateStageForm";
-import "@goauthentik/web/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm";
-import "@goauthentik/web/pages/stages/captcha/CaptchaStageForm";
-import "@goauthentik/web/pages/stages/consent/ConsentStageForm";
-import "@goauthentik/web/pages/stages/deny/DenyStageForm";
-import "@goauthentik/web/pages/stages/dummy/DummyStageForm";
-import "@goauthentik/web/pages/stages/email/EmailStageForm";
-import "@goauthentik/web/pages/stages/identification/IdentificationStageForm";
-import "@goauthentik/web/pages/stages/invitation/InvitationStageForm";
-import "@goauthentik/web/pages/stages/password/PasswordStageForm";
-import "@goauthentik/web/pages/stages/prompt/PromptStageForm";
-import "@goauthentik/web/pages/stages/user_delete/UserDeleteStageForm";
-import "@goauthentik/web/pages/stages/user_login/UserLoginStageForm";
-import "@goauthentik/web/pages/stages/user_logout/UserLogoutStageForm";
-import "@goauthentik/web/pages/stages/user_write/UserWriteStageForm";
-import { groupBy } from "@goauthentik/web/utils";
+import "@goauthentik/admin/stages/StageWizard";
+import "@goauthentik/admin/stages/authenticator_duo/AuthenticatorDuoStageForm";
+import "@goauthentik/admin/stages/authenticator_sms/AuthenticatorSMSStageForm";
+import "@goauthentik/admin/stages/authenticator_static/AuthenticatorStaticStageForm";
+import "@goauthentik/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm";
+import "@goauthentik/admin/stages/authenticator_validate/AuthenticatorValidateStageForm";
+import "@goauthentik/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm";
+import "@goauthentik/admin/stages/captcha/CaptchaStageForm";
+import "@goauthentik/admin/stages/consent/ConsentStageForm";
+import "@goauthentik/admin/stages/deny/DenyStageForm";
+import "@goauthentik/admin/stages/dummy/DummyStageForm";
+import "@goauthentik/admin/stages/email/EmailStageForm";
+import "@goauthentik/admin/stages/identification/IdentificationStageForm";
+import "@goauthentik/admin/stages/invitation/InvitationStageForm";
+import "@goauthentik/admin/stages/password/PasswordStageForm";
+import "@goauthentik/admin/stages/prompt/PromptStageForm";
+import "@goauthentik/admin/stages/user_delete/UserDeleteStageForm";
+import "@goauthentik/admin/stages/user_login/UserLoginStageForm";
+import "@goauthentik/admin/stages/user_logout/UserLogoutStageForm";
+import "@goauthentik/admin/stages/user_write/UserWriteStageForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { groupBy } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import "@goauthentik/elements/forms/ProxyForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -56,7 +56,7 @@ export class StageListPage extends TablePage<Stage> {
     @property()
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Stage>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Stage>> {
         return new StagesApi(DEFAULT_CONFIG).stagesAllList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/stages/StageWizard.ts b/web/src/admin/stages/StageWizard.ts
similarity index 63%
rename from web/src/pages/stages/StageWizard.ts
rename to web/src/admin/stages/StageWizard.ts
index 7750e1746..b1938b1ff 100644
--- a/web/src/pages/stages/StageWizard.ts
+++ b/web/src/admin/stages/StageWizard.ts
@@ -1,35 +1,36 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/ProxyForm";
-import "@goauthentik/web/elements/wizard/FormWizardPage";
-import "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
-import "@goauthentik/web/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts";
-import "@goauthentik/web/pages/stages/authenticator_sms/AuthenticatorSMSStageForm.ts";
-import "@goauthentik/web/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts";
-import "@goauthentik/web/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts";
-import "@goauthentik/web/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts";
-import "@goauthentik/web/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts";
-import "@goauthentik/web/pages/stages/captcha/CaptchaStageForm.ts";
-import "@goauthentik/web/pages/stages/consent/ConsentStageForm.ts";
-import "@goauthentik/web/pages/stages/deny/DenyStageForm.ts";
-import "@goauthentik/web/pages/stages/dummy/DummyStageForm.ts";
-import "@goauthentik/web/pages/stages/email/EmailStageForm.ts";
-import "@goauthentik/web/pages/stages/identification/IdentificationStageForm.ts";
-import "@goauthentik/web/pages/stages/invitation/InvitationStageForm.ts";
-import "@goauthentik/web/pages/stages/password/PasswordStageForm.ts";
-import "@goauthentik/web/pages/stages/prompt/PromptStageForm.ts";
-import "@goauthentik/web/pages/stages/user_delete/UserDeleteStageForm.ts";
-import "@goauthentik/web/pages/stages/user_login/UserLoginStageForm.ts";
-import "@goauthentik/web/pages/stages/user_logout/UserLogoutStageForm.ts";
-import "@goauthentik/web/pages/stages/user_write/UserWriteStageForm.ts";
+import "@goauthentik/admin/stages/authenticator_duo/AuthenticatorDuoStageForm";
+import "@goauthentik/admin/stages/authenticator_sms/AuthenticatorSMSStageForm";
+import "@goauthentik/admin/stages/authenticator_static/AuthenticatorStaticStageForm";
+import "@goauthentik/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm";
+import "@goauthentik/admin/stages/authenticator_validate/AuthenticatorValidateStageForm";
+import "@goauthentik/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm";
+import "@goauthentik/admin/stages/captcha/CaptchaStageForm";
+import "@goauthentik/admin/stages/consent/ConsentStageForm";
+import "@goauthentik/admin/stages/deny/DenyStageForm";
+import "@goauthentik/admin/stages/dummy/DummyStageForm";
+import "@goauthentik/admin/stages/email/EmailStageForm";
+import "@goauthentik/admin/stages/identification/IdentificationStageForm";
+import "@goauthentik/admin/stages/invitation/InvitationStageForm";
+import "@goauthentik/admin/stages/password/PasswordStageForm";
+import "@goauthentik/admin/stages/prompt/PromptStageForm";
+import "@goauthentik/admin/stages/user_delete/UserDeleteStageForm";
+import "@goauthentik/admin/stages/user_login/UserLoginStageForm";
+import "@goauthentik/admin/stages/user_logout/UserLogoutStageForm";
+import "@goauthentik/admin/stages/user_write/UserWriteStageForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/forms/ProxyForm";
+import "@goauthentik/elements/wizard/FormWizardPage";
+import "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@@ -75,7 +76,7 @@ export class InitialStageWizardPage extends WizardPage {
 }
 
 @customElement("ak-stage-wizard")
-export class StageWizard extends LitElement {
+export class StageWizard extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFButton, AKGlobal, PFRadio];
     }
diff --git a/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
similarity index 95%
rename from web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
rename to web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
index e54e56c4c..aad30e781 100644
--- a/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
+++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
similarity index 97%
rename from web/src/pages/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
rename to web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
index a629a0cc4..0ad8a3918 100644
--- a/web/src/pages/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
+++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
similarity index 94%
rename from web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
rename to web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
index 22eeb2e1d..4b60e2783 100644
--- a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
+++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
similarity index 95%
rename from web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
rename to web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
index 5db228051..9f5e9a204 100644
--- a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
+++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
similarity index 97%
rename from web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
rename to web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index 121e656d4..85e9421a1 100644
--- a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
similarity index 98%
rename from web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
rename to web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
index f871d0d3f..d90177cea 100644
--- a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
+++ b/web/src/admin/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts
similarity index 93%
rename from web/src/pages/stages/captcha/CaptchaStageForm.ts
rename to web/src/admin/stages/captcha/CaptchaStageForm.ts
index c9ebad0a1..f161897d0 100644
--- a/web/src/pages/stages/captcha/CaptchaStageForm.ts
+++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/consent/ConsentStageForm.ts b/web/src/admin/stages/consent/ConsentStageForm.ts
similarity index 94%
rename from web/src/pages/stages/consent/ConsentStageForm.ts
rename to web/src/admin/stages/consent/ConsentStageForm.ts
index f6ca00e43..5cb8843da 100644
--- a/web/src/pages/stages/consent/ConsentStageForm.ts
+++ b/web/src/admin/stages/consent/ConsentStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts
similarity index 90%
rename from web/src/pages/stages/deny/DenyStageForm.ts
rename to web/src/admin/stages/deny/DenyStageForm.ts
index 2c2ae2729..74f64b9c2 100644
--- a/web/src/pages/stages/deny/DenyStageForm.ts
+++ b/web/src/admin/stages/deny/DenyStageForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/dummy/DummyStageForm.ts b/web/src/admin/stages/dummy/DummyStageForm.ts
similarity index 90%
rename from web/src/pages/stages/dummy/DummyStageForm.ts
rename to web/src/admin/stages/dummy/DummyStageForm.ts
index c82616164..950695e31 100644
--- a/web/src/pages/stages/dummy/DummyStageForm.ts
+++ b/web/src/admin/stages/dummy/DummyStageForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts
similarity index 97%
rename from web/src/pages/stages/email/EmailStageForm.ts
rename to web/src/admin/stages/email/EmailStageForm.ts
index 0623421dc..65b4ceb90 100644
--- a/web/src/pages/stages/email/EmailStageForm.ts
+++ b/web/src/admin/stages/email/EmailStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/identification/IdentificationStageForm.ts b/web/src/admin/stages/identification/IdentificationStageForm.ts
similarity index 98%
rename from web/src/pages/stages/identification/IdentificationStageForm.ts
rename to web/src/admin/stages/identification/IdentificationStageForm.ts
index 96d163967..cc9748f78 100644
--- a/web/src/pages/stages/identification/IdentificationStageForm.ts
+++ b/web/src/admin/stages/identification/IdentificationStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts
similarity index 91%
rename from web/src/pages/stages/invitation/InvitationForm.ts
rename to web/src/admin/stages/invitation/InvitationForm.ts
index 4090604c4..8a0066199 100644
--- a/web/src/pages/stages/invitation/InvitationForm.ts
+++ b/web/src/admin/stages/invitation/InvitationForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { dateTimeLocal, first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { dateTimeLocal, first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/stages/invitation/InvitationListLink.ts b/web/src/admin/stages/invitation/InvitationListLink.ts
similarity index 94%
rename from web/src/pages/stages/invitation/InvitationListLink.ts
rename to web/src/admin/stages/invitation/InvitationListLink.ts
index 3dad6a52c..63187c481 100644
--- a/web/src/pages/stages/invitation/InvitationListLink.ts
+++ b/web/src/admin/stages/invitation/InvitationListLink.ts
@@ -1,12 +1,13 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -16,7 +17,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { StagesApi } from "@goauthentik/api";
 
 @customElement("ak-stage-invitation-list-link")
-export class InvitationListLink extends LitElement {
+export class InvitationListLink extends AKElement {
     @property()
     invitation?: string;
 
diff --git a/web/src/pages/stages/invitation/InvitationListPage.ts b/web/src/admin/stages/invitation/InvitationListPage.ts
similarity index 86%
rename from web/src/pages/stages/invitation/InvitationListPage.ts
rename to web/src/admin/stages/invitation/InvitationListPage.ts
index 475eeaa99..1b3d7c319 100644
--- a/web/src/pages/stages/invitation/InvitationListPage.ts
+++ b/web/src/admin/stages/invitation/InvitationListPage.ts
@@ -1,14 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/stages/invitation/InvitationForm";
-import "@goauthentik/web/pages/stages/invitation/InvitationListLink";
+import "@goauthentik/admin/stages/invitation/InvitationForm";
+import "@goauthentik/admin/stages/invitation/InvitationListLink";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -49,7 +49,7 @@ export class InvitationListPage extends TablePage<Invitation> {
     @state()
     invitationStageExists = false;
 
-    async apiEndpoint(page: number): Promise<AKResponse<Invitation>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Invitation>> {
         const stages = await new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesList({
             noFlows: false,
         });
diff --git a/web/src/pages/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts
similarity index 91%
rename from web/src/pages/stages/invitation/InvitationStageForm.ts
rename to web/src/admin/stages/invitation/InvitationStageForm.ts
index 68735e463..8b4212de2 100644
--- a/web/src/pages/stages/invitation/InvitationStageForm.ts
+++ b/web/src/admin/stages/invitation/InvitationStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts
similarity index 96%
rename from web/src/pages/stages/password/PasswordStageForm.ts
rename to web/src/admin/stages/password/PasswordStageForm.ts
index 37052be3e..e004a0175 100644
--- a/web/src/pages/stages/password/PasswordStageForm.ts
+++ b/web/src/admin/stages/password/PasswordStageForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/prompt/PromptForm.ts b/web/src/admin/stages/prompt/PromptForm.ts
similarity index 96%
rename from web/src/pages/stages/prompt/PromptForm.ts
rename to web/src/admin/stages/prompt/PromptForm.ts
index 9003282a0..553b25bd0 100644
--- a/web/src/pages/stages/prompt/PromptForm.ts
+++ b/web/src/admin/stages/prompt/PromptForm.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/prompt/PromptListPage.ts b/web/src/admin/stages/prompt/PromptListPage.ts
similarity index 81%
rename from web/src/pages/stages/prompt/PromptListPage.ts
rename to web/src/admin/stages/prompt/PromptListPage.ts
index f96926422..7dd9dd269 100644
--- a/web/src/pages/stages/prompt/PromptListPage.ts
+++ b/web/src/admin/stages/prompt/PromptListPage.ts
@@ -1,14 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/stages/prompt/PromptForm";
-import { truncate } from "@goauthentik/web/utils";
+import "@goauthentik/admin/stages/prompt/PromptForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { truncate } from "@goauthentik/common/utils";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -37,7 +37,7 @@ export class PromptListPage extends TablePage<Prompt> {
     @property()
     order = "order";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Prompt>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Prompt>> {
         return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts
similarity index 94%
rename from web/src/pages/stages/prompt/PromptStageForm.ts
rename to web/src/admin/stages/prompt/PromptStageForm.ts
index a6a8ec0e8..ad361d7ef 100644
--- a/web/src/pages/stages/prompt/PromptStageForm.ts
+++ b/web/src/admin/stages/prompt/PromptStageForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/pages/stages/prompt/PromptForm";
+import "@goauthentik/admin/stages/prompt/PromptForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import "@goauthentik/elements/forms/ModalForm";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
similarity index 90%
rename from web/src/pages/stages/user_delete/UserDeleteStageForm.ts
rename to web/src/admin/stages/user_delete/UserDeleteStageForm.ts
index efc687d48..ea4fe296f 100644
--- a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
+++ b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts
similarity index 88%
rename from web/src/pages/stages/user_login/UserLoginStageForm.ts
rename to web/src/admin/stages/user_login/UserLoginStageForm.ts
index 23fa33f6a..6ccb9ca82 100644
--- a/web/src/pages/stages/user_login/UserLoginStageForm.ts
+++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/elements/utils/TimeDeltaHelp";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import "@goauthentik/elements/utils/TimeDeltaHelp";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
similarity index 89%
rename from web/src/pages/stages/user_logout/UserLogoutStageForm.ts
rename to web/src/admin/stages/user_logout/UserLogoutStageForm.ts
index 0668c7211..5403a0533 100644
--- a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
+++ b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/stages/user_write/UserWriteStageForm.ts b/web/src/admin/stages/user_write/UserWriteStageForm.ts
similarity index 93%
rename from web/src/pages/stages/user_write/UserWriteStageForm.ts
rename to web/src/admin/stages/user_write/UserWriteStageForm.ts
index 733140ac1..a325bbae7 100644
--- a/web/src/pages/stages/user_write/UserWriteStageForm.ts
+++ b/web/src/admin/stages/user_write/UserWriteStageForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/SearchSelect";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/SearchSelect";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/system-tasks/SystemTaskListPage.ts b/web/src/admin/system-tasks/SystemTaskListPage.ts
similarity index 88%
rename from web/src/pages/system-tasks/SystemTaskListPage.ts
rename to web/src/admin/system-tasks/SystemTaskListPage.ts
index bc4a6e2f5..3fafd1708 100644
--- a/web/src/pages/system-tasks/SystemTaskListPage.ts
+++ b/web/src/admin/system-tasks/SystemTaskListPage.ts
@@ -1,11 +1,11 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -40,7 +40,7 @@ export class SystemTaskListPage extends TablePage<Task> {
         return super.styles.concat(PFDescriptionList);
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<Task>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Task>> {
         return new AdminApi(DEFAULT_CONFIG).adminSystemTasksList().then((tasks) => {
             return {
                 pagination: {
diff --git a/web/src/pages/tenants/TenantForm.ts b/web/src/admin/tenants/TenantForm.ts
similarity index 97%
rename from web/src/pages/tenants/TenantForm.ts
rename to web/src/admin/tenants/TenantForm.ts
index 2a620fc58..1cfb5ac0b 100644
--- a/web/src/pages/tenants/TenantForm.ts
+++ b/web/src/admin/tenants/TenantForm.ts
@@ -1,10 +1,10 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { DefaultTenant } from "@goauthentik/web/elements/sidebar/SidebarBrand";
-import { first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import { DefaultTenant } from "@goauthentik/elements/sidebar/SidebarBrand";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/tenants/TenantListPage.ts b/web/src/admin/tenants/TenantListPage.ts
similarity index 82%
rename from web/src/pages/tenants/TenantListPage.ts
rename to web/src/admin/tenants/TenantListPage.ts
index 03c740856..aea2961f9 100644
--- a/web/src/pages/tenants/TenantListPage.ts
+++ b/web/src/admin/tenants/TenantListPage.ts
@@ -1,13 +1,13 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/tenants/TenantForm";
+import "@goauthentik/admin/tenants/TenantForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -36,7 +36,7 @@ export class TenantListPage extends TablePage<Tenant> {
     @property()
     order = "domain";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Tenant>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Tenant>> {
         return new CoreApi(DEFAULT_CONFIG).coreTenantsList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/tokens/TokenForm.ts b/web/src/admin/tokens/TokenForm.ts
similarity index 92%
rename from web/src/pages/tokens/TokenForm.ts
rename to web/src/admin/tokens/TokenForm.ts
index d8102953e..b07a1c14d 100644
--- a/web/src/pages/tokens/TokenForm.ts
+++ b/web/src/admin/tokens/TokenForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/FormGroup";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import { UserOption } from "@goauthentik/web/elements/user/utils";
-import { dateTimeLocal, first } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { dateTimeLocal, first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/forms/FormGroup";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
+import { UserOption } from "@goauthentik/elements/user/utils";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/admin/tokens/TokenListPage.ts
similarity index 86%
rename from web/src/pages/tokens/TokenListPage.ts
rename to web/src/admin/tokens/TokenListPage.ts
index f5c6c1e3d..d8b18adf7 100644
--- a/web/src/pages/tokens/TokenListPage.ts
+++ b/web/src/admin/tokens/TokenListPage.ts
@@ -1,14 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/Dropdown";
-import "@goauthentik/web/elements/buttons/TokenCopyButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/tokens/TokenForm";
+import "@goauthentik/admin/tokens/TokenForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/Dropdown";
+import "@goauthentik/elements/buttons/TokenCopyButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -50,7 +50,7 @@ export class TokenListPage extends TablePage<Token> {
     @property()
     order = "expires";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Token>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Token>> {
         return new CoreApi(DEFAULT_CONFIG).coreTokensList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/users/GroupSelectModal.ts b/web/src/admin/users/GroupSelectModal.ts
similarity index 82%
rename from web/src/pages/users/GroupSelectModal.ts
rename to web/src/admin/users/GroupSelectModal.ts
index ff059ec4d..bbd1b23d3 100644
--- a/web/src/pages/users/GroupSelectModal.ts
+++ b/web/src/admin/users/GroupSelectModal.ts
@@ -1,10 +1,10 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TableModal } from "@goauthentik/web/elements/table/TableModal";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TableModal } from "@goauthentik/elements/table/TableModal";
 
 import { t } from "@lingui/macro";
 
@@ -27,7 +27,7 @@ export class GroupSelectModal extends TableModal<Group> {
 
     order = "name";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Group>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
         return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
             ordering: this.order,
             page: page,
@@ -52,7 +52,7 @@ export class GroupSelectModal extends TableModal<Group> {
             html` <ak-label color=${item.isSuperuser ? PFColor.Green : PFColor.Grey}>
                 ${item.isSuperuser ? t`Yes` : t`No`}
             </ak-label>`,
-            html`${item.users.length}`,
+            html`${(item.users || []).length}`,
         ];
     }
 
diff --git a/web/src/pages/users/RelatedUserList.ts b/web/src/admin/users/RelatedUserList.ts
similarity index 93%
rename from web/src/pages/users/RelatedUserList.ts
rename to web/src/admin/users/RelatedUserList.ts
index 0f67e5db4..b15511f24 100644
--- a/web/src/pages/users/RelatedUserList.ts
+++ b/web/src/admin/users/RelatedUserList.ts
@@ -1,21 +1,21 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG, config, tenant } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/pages/users/ServiceAccountForm";
-import "@goauthentik/web/pages/users/UserActiveForm";
-import "@goauthentik/web/pages/users/UserForm";
-import "@goauthentik/web/pages/users/UserPasswordForm";
-import "@goauthentik/web/pages/users/UserResetEmailForm";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/admin/users/ServiceAccountForm";
+import "@goauthentik/admin/users/UserActiveForm";
+import "@goauthentik/admin/users/UserForm";
+import "@goauthentik/admin/users/UserPasswordForm";
+import "@goauthentik/admin/users/UserResetEmailForm";
+import { DEFAULT_CONFIG, config, tenant } from "@goauthentik/common/api/config";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { me } from "@goauthentik/common/users";
+import { first } from "@goauthentik/common/utils";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -50,7 +50,7 @@ export class RelatedUserList extends Table<User> {
         return super.styles.concat(PFDescriptionList, PFAlert);
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<User>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<User>> {
         return new CoreApi(DEFAULT_CONFIG).coreUsersList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/users/ServiceAccountForm.ts b/web/src/admin/users/ServiceAccountForm.ts
similarity index 93%
rename from web/src/pages/users/ServiceAccountForm.ts
rename to web/src/admin/users/ServiceAccountForm.ts
index d3704cf5c..ba0f50a33 100644
--- a/web/src/pages/users/ServiceAccountForm.ts
+++ b/web/src/admin/users/ServiceAccountForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModalForm } from "@goauthentik/web/elements/forms/ModalForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModalForm } from "@goauthentik/elements/forms/ModalForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/users/UserActiveForm.ts b/web/src/admin/users/UserActiveForm.ts
similarity index 86%
rename from web/src/pages/users/UserActiveForm.ts
rename to web/src/admin/users/UserActiveForm.ts
index 3e8c1890a..d40bb7333 100644
--- a/web/src/pages/users/UserActiveForm.ts
+++ b/web/src/admin/users/UserActiveForm.ts
@@ -1,7 +1,7 @@
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { DeleteForm } from "@goauthentik/web/elements/forms/DeleteForm";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { MessageLevel } from "@goauthentik/common/messages";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { DeleteForm } from "@goauthentik/elements/forms/DeleteForm";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/users/UserForm.ts b/web/src/admin/users/UserForm.ts
similarity index 95%
rename from web/src/pages/users/UserForm.ts
rename to web/src/admin/users/UserForm.ts
index 655fa74b5..776af1e94 100644
--- a/web/src/pages/users/UserForm.ts
+++ b/web/src/admin/users/UserForm.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/CodeMirror";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
-import "@goauthentik/web/pages/users/GroupSelectModal";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/admin/users/GroupSelectModal";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { first } from "@goauthentik/common/utils";
+import "@goauthentik/elements/CodeMirror";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import YAML from "yaml";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/pages/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts
similarity index 92%
rename from web/src/pages/users/UserListPage.ts
rename to web/src/admin/users/UserListPage.ts
index e985254d0..48af04ed4 100644
--- a/web/src/pages/users/UserListPage.ts
+++ b/web/src/admin/users/UserListPage.ts
@@ -1,24 +1,24 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG, config, tenant } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/TreeView";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { getURLParam } from "@goauthentik/web/elements/router/RouteMatch";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import { TablePage } from "@goauthentik/web/elements/table/TablePage";
-import "@goauthentik/web/pages/users/ServiceAccountForm";
-import "@goauthentik/web/pages/users/UserActiveForm";
-import "@goauthentik/web/pages/users/UserForm";
-import "@goauthentik/web/pages/users/UserPasswordForm";
-import "@goauthentik/web/pages/users/UserResetEmailForm";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/admin/users/ServiceAccountForm";
+import "@goauthentik/admin/users/UserActiveForm";
+import "@goauthentik/admin/users/UserForm";
+import "@goauthentik/admin/users/UserPasswordForm";
+import "@goauthentik/admin/users/UserResetEmailForm";
+import { DEFAULT_CONFIG, config, tenant } from "@goauthentik/common/api/config";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { me } from "@goauthentik/common/users";
+import { first } from "@goauthentik/common/utils";
+import { PFColor } from "@goauthentik/elements/Label";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/TreeView";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { getURLParam } from "@goauthentik/elements/router/RouteMatch";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { TablePage } from "@goauthentik/elements/table/TablePage";
 
 import { t } from "@lingui/macro";
 
@@ -26,7 +26,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
@@ -61,7 +61,7 @@ export class UserListPage extends TablePage<User> {
         return super.styles.concat(PFDescriptionList, PFCard, PFAlert, AKGlobal);
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<User>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<User>> {
         return new CoreApi(DEFAULT_CONFIG).coreUsersList({
             ordering: this.order,
             page: page,
diff --git a/web/src/pages/users/UserPasswordForm.ts b/web/src/admin/users/UserPasswordForm.ts
similarity index 81%
rename from web/src/pages/users/UserPasswordForm.ts
rename to web/src/admin/users/UserPasswordForm.ts
index 4a3cae192..b6de9eca0 100644
--- a/web/src/pages/users/UserPasswordForm.ts
+++ b/web/src/admin/users/UserPasswordForm.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/users/UserResetEmailForm.ts b/web/src/admin/users/UserResetEmailForm.ts
similarity index 90%
rename from web/src/pages/users/UserResetEmailForm.ts
rename to web/src/admin/users/UserResetEmailForm.ts
index 7a68f871c..a85994085 100644
--- a/web/src/pages/users/UserResetEmailForm.ts
+++ b/web/src/admin/users/UserResetEmailForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { Form } from "@goauthentik/elements/forms/Form";
+import "@goauthentik/elements/forms/HorizontalFormElement";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts
similarity index 91%
rename from web/src/pages/users/UserViewPage.ts
rename to web/src/admin/users/UserViewPage.ts
index d3dea941c..eebbcda54 100644
--- a/web/src/pages/users/UserViewPage.ts
+++ b/web/src/admin/users/UserViewPage.ts
@@ -1,34 +1,35 @@
-import { DEFAULT_CONFIG, config } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/CodeMirror";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/PageHeader";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/ActionButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/charts/UserChart";
-import "@goauthentik/web/elements/events/ObjectChangelog";
-import "@goauthentik/web/elements/events/UserEvents";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/elements/oauth/UserRefreshList";
-import "@goauthentik/web/elements/user/SessionList";
-import "@goauthentik/web/elements/user/UserConsentList";
-import "@goauthentik/web/elements/user/UserDevicesList";
-import "@goauthentik/web/pages/groups/RelatedGroupList";
-import "@goauthentik/web/pages/users/UserActiveForm";
-import "@goauthentik/web/pages/users/UserForm";
-import "@goauthentik/web/pages/users/UserPasswordForm";
+import "@goauthentik/admin/groups/RelatedGroupList";
+import "@goauthentik/admin/users/UserActiveForm";
+import "@goauthentik/admin/users/UserForm";
+import "@goauthentik/admin/users/UserPasswordForm";
+import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/CodeMirror";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/PageHeader";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/ActionButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/charts/UserChart";
+import "@goauthentik/elements/events/ObjectChangelog";
+import "@goauthentik/elements/events/UserEvents";
+import "@goauthentik/elements/forms/ModalForm";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/elements/oauth/UserRefreshList";
+import "@goauthentik/elements/user/SessionList";
+import "@goauthentik/elements/user/UserConsentList";
+import "@goauthentik/elements/user/UserDevicesList";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -43,7 +44,7 @@ import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import { CapabilitiesEnum, CoreApi, User } from "@goauthentik/api";
 
 @customElement("ak-user-view")
-export class UserViewPage extends LitElement {
+export class UserViewPage extends AKElement {
     @property({ type: Number })
     set userId(id: number) {
         new CoreApi(DEFAULT_CONFIG)
diff --git a/web/src/api/Client.ts b/web/src/api/Client.ts
deleted file mode 100644
index e7b79a27e..000000000
--- a/web/src/api/Client.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export interface AKPagination {
-    next?: number;
-    previous?: number;
-
-    count: number;
-    current: number;
-    totalPages: number;
-
-    startIndex: number;
-    endIndex: number;
-}
-
-export interface AKResponse<T> {
-    pagination: AKPagination;
-
-    results: Array<T>;
-}
diff --git a/web/src/api/Error.ts b/web/src/api/Error.ts
deleted file mode 100644
index ed39d59f5..000000000
--- a/web/src/api/Error.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export class NotFoundError extends Error {}
-export class RequestError extends Error {}
diff --git a/web/src/api/Config.ts b/web/src/common/api/config.ts
similarity index 69%
rename from web/src/api/Config.ts
rename to web/src/common/api/config.ts
index b61f26228..0d554b92d 100644
--- a/web/src/api/Config.ts
+++ b/web/src/common/api/config.ts
@@ -1,9 +1,11 @@
-import { globalAK } from "@goauthentik/web/api/Global";
-import { EVENT_REFRESH, VERSION } from "@goauthentik/web/constants";
-import { MessageMiddleware } from "@goauthentik/web/elements/messages/Middleware";
-import { APIMiddleware } from "@goauthentik/web/elements/notifications/APIDrawer";
-import { activateLocale } from "@goauthentik/web/interfaces/locale";
-import { getCookie } from "@goauthentik/web/utils";
+import {
+    CSRFMiddleware,
+    EventMiddleware,
+    LoggingMiddleware,
+} from "@goauthentik/common/api/middleware";
+import { EVENT_REFRESH, VERSION } from "@goauthentik/common/constants";
+import { globalAK } from "@goauthentik/common/global";
+import { activateLocale } from "@goauthentik/common/ui/locale";
 
 import {
     Config,
@@ -12,24 +14,9 @@ import {
     CoreApi,
     CurrentTenant,
     CurrentTenantFromJSON,
-    FetchParams,
-    Middleware,
-    RequestContext,
-    ResponseContext,
     RootApi,
 } from "@goauthentik/api";
 
-export class LoggingMiddleware implements Middleware {
-    post(context: ResponseContext): Promise<Response | void> {
-        tenant().then((tenant) => {
-            let msg = `authentik/api[${tenant.matchedDomain}]: `;
-            msg += `${context.response.status} ${context.init.method} ${context.url}`;
-            console.debug(msg);
-        });
-        return Promise.resolve(context.response);
-    }
-}
-
 let globalConfigPromise: Promise<Config> | undefined = Promise.resolve(
     ConfigFromJSON(globalAK()?.config),
 );
@@ -81,14 +68,6 @@ export function tenant(): Promise<CurrentTenant> {
     return globalTenantPromise;
 }
 
-export class CSRFMiddleware implements Middleware {
-    pre?(context: RequestContext): Promise<FetchParams | void> {
-        // @ts-ignore
-        context.init.headers["X-authentik-CSRF"] = getCookie("authentik_csrf");
-        return Promise.resolve(context);
-    }
-}
-
 export function getMetaContent(key: string): string {
     const metaEl = document.querySelector<HTMLMetaElement>(`meta[name=${key}]`);
     if (!metaEl) return "";
@@ -102,9 +81,8 @@ export const DEFAULT_CONFIG = new Configuration({
     },
     middleware: [
         new CSRFMiddleware(),
-        new APIMiddleware(),
-        new MessageMiddleware(),
-        new LoggingMiddleware(),
+        new EventMiddleware(),
+        new LoggingMiddleware(CurrentTenantFromJSON(globalAK()?.tenant)),
     ],
 });
 
diff --git a/web/src/common/api/middleware.ts b/web/src/common/api/middleware.ts
new file mode 100644
index 000000000..3f67c3e5f
--- /dev/null
+++ b/web/src/common/api/middleware.ts
@@ -0,0 +1,56 @@
+import { EVENT_REQUEST_POST } from "@goauthentik/common/constants";
+import { getCookie } from "@goauthentik/common/utils";
+
+import {
+    CurrentTenant,
+    FetchParams,
+    Middleware,
+    RequestContext,
+    ResponseContext,
+} from "@goauthentik/api";
+
+export interface RequestInfo {
+    method: string;
+    path: string;
+    status: number;
+}
+
+export class LoggingMiddleware implements Middleware {
+    tenant: CurrentTenant;
+    constructor(tenant: CurrentTenant) {
+        this.tenant = tenant;
+    }
+
+    post(context: ResponseContext): Promise<Response | void> {
+        let msg = `authentik/api[${this.tenant.matchedDomain}]: `;
+        msg += `${context.response.status} ${context.init.method} ${context.url}`;
+        console.debug(msg);
+        return Promise.resolve(context.response);
+    }
+}
+
+export class CSRFMiddleware implements Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void> {
+        // @ts-ignore
+        context.init.headers["X-authentik-CSRF"] = getCookie("authentik_csrf");
+        return Promise.resolve(context);
+    }
+}
+
+export class EventMiddleware implements Middleware {
+    post?(context: ResponseContext): Promise<Response | void> {
+        const request: RequestInfo = {
+            method: (context.init.method || "GET").toUpperCase(),
+            path: context.url,
+            status: context.response.status,
+        };
+        window.dispatchEvent(
+            new CustomEvent(EVENT_REQUEST_POST, {
+                bubbles: true,
+                composed: true,
+                detail: request,
+            }),
+        );
+        return Promise.resolve(context.response);
+    }
+}
diff --git a/web/src/constants.ts b/web/src/common/constants.ts
similarity index 83%
rename from web/src/constants.ts
rename to web/src/common/constants.ts
index ac1afc5d1..046770726 100644
--- a/web/src/constants.ts
+++ b/web/src/common/constants.ts
@@ -11,9 +11,11 @@ export const EVENT_REFRESH = "ak-refresh";
 export const EVENT_NOTIFICATION_DRAWER_TOGGLE = "ak-notification-toggle";
 export const EVENT_API_DRAWER_TOGGLE = "ak-api-drawer-toggle";
 export const EVENT_SIDEBAR_TOGGLE = "ak-sidebar-toggle";
-export const EVENT_API_DRAWER_REFRESH = "ak-api-drawer-refresh";
 export const EVENT_WS_MESSAGE = "ak-ws-message";
 export const EVENT_FLOW_ADVANCE = "ak-flow-advance";
+export const EVENT_LOCALE_CHANGE = "ak-locale-change";
+export const EVENT_REQUEST_POST = "ak-request-post";
+export const EVENT_MESSAGE = "ak-message";
 
 export const WS_MSG_TYPE_MESSAGE = "message";
 export const WS_MSG_TYPE_REFRESH = "refresh";
diff --git a/web/src/common/errors.ts b/web/src/common/errors.ts
index 652c5a315..7ef4a308c 100644
--- a/web/src/common/errors.ts
+++ b/web/src/common/errors.ts
@@ -1 +1,3 @@
 export class SentryIgnoredError extends Error {}
+export class NotFoundError extends Error {}
+export class RequestError extends Error {}
diff --git a/web/src/api/Events.ts b/web/src/common/events.ts
similarity index 100%
rename from web/src/api/Events.ts
rename to web/src/common/events.ts
diff --git a/web/src/api/Global.ts b/web/src/common/global.ts
similarity index 100%
rename from web/src/api/Global.ts
rename to web/src/common/global.ts
diff --git a/web/src/api/Plex.ts b/web/src/common/helpers/plex.ts
similarity index 95%
rename from web/src/api/Plex.ts
rename to web/src/common/helpers/plex.ts
index 6295a5fe9..6da06f078 100644
--- a/web/src/api/Plex.ts
+++ b/web/src/common/helpers/plex.ts
@@ -1,5 +1,5 @@
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import { VERSION } from "@goauthentik/web/constants";
+import { VERSION } from "@goauthentik/common/constants";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
 
 export interface PlexPinResponse {
     // Only has the fields we care about
@@ -95,7 +95,7 @@ export class PlexAPIClient {
                     setTimeout(executePoll, 500, resolve, reject);
                 }
             } catch (e) {
-                reject(e);
+                reject(e as Error);
             }
         };
 
diff --git a/web/src/flows/stages/authenticator_webauthn/utils.ts b/web/src/common/helpers/webauthn.ts
similarity index 100%
rename from web/src/flows/stages/authenticator_webauthn/utils.ts
rename to web/src/common/helpers/webauthn.ts
diff --git a/web/src/common/messages.ts b/web/src/common/messages.ts
new file mode 100644
index 000000000..651a7d9f3
--- /dev/null
+++ b/web/src/common/messages.ts
@@ -0,0 +1,6 @@
+export enum MessageLevel {
+    error = "error",
+    warning = "warning",
+    success = "success",
+    info = "info",
+}
diff --git a/web/src/api/Sentry.ts b/web/src/common/sentry.ts
similarity index 93%
rename from web/src/api/Sentry.ts
rename to web/src/common/sentry.ts
index 27dc924c8..d8670907f 100644
--- a/web/src/api/Sentry.ts
+++ b/web/src/common/sentry.ts
@@ -1,7 +1,7 @@
-import { config } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import { VERSION } from "@goauthentik/web/constants";
+import { config } from "@goauthentik/common/api/config";
+import { VERSION } from "@goauthentik/common/constants";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
+import { me } from "@goauthentik/common/users";
 import * as Sentry from "@sentry/browser";
 import { Integrations } from "@sentry/tracing";
 
diff --git a/web/src/authentik.css b/web/src/common/styles/authentik.css
similarity index 100%
rename from web/src/authentik.css
rename to web/src/common/styles/authentik.css
diff --git a/web/src/common/config.ts b/web/src/common/ui/config.ts
similarity index 97%
rename from web/src/common/config.ts
rename to web/src/common/ui/config.ts
index e913cee16..73067867a 100644
--- a/web/src/common/config.ts
+++ b/web/src/common/ui/config.ts
@@ -1,4 +1,4 @@
-import { me } from "@goauthentik/web/api/Users";
+import { me } from "@goauthentik/common/users";
 
 import { UserSelf } from "@goauthentik/api";
 
diff --git a/web/src/interfaces/locale.ts b/web/src/common/ui/locale.ts
similarity index 77%
rename from web/src/interfaces/locale.ts
rename to web/src/common/ui/locale.ts
index 07c597f5f..8b6ee9194 100644
--- a/web/src/interfaces/locale.ts
+++ b/web/src/common/ui/locale.ts
@@ -1,11 +1,10 @@
-import { globalAK } from "@goauthentik/web/api/Global";
+import { EVENT_LOCALE_CHANGE } from "@goauthentik/common/constants";
+import { globalAK } from "@goauthentik/common/global";
 
 import { Messages, i18n } from "@lingui/core";
 import { detect, fromNavigator, fromUrl } from "@lingui/detect-locale";
 import { t } from "@lingui/macro";
 
-import { LitElement } from "lit";
-
 interface Locale {
     locale: Messages;
     // eslint-disable-next-line @typescript-eslint/ban-types
@@ -22,7 +21,7 @@ export const LOCALES: {
         label: t`English`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/en")).messages,
+                locale: (await import("@goauthentik/locales/en")).messages,
                 plurals: (await import("make-plural/plurals")).en,
             };
         },
@@ -32,7 +31,7 @@ export const LOCALES: {
         label: t`Debug`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/pseudo-LOCALE")).messages,
+                locale: (await import("@goauthentik/locales/pseudo-LOCALE")).messages,
                 plurals: (await import("make-plural/plurals")).en,
             };
         },
@@ -42,7 +41,7 @@ export const LOCALES: {
         label: t`French`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/fr_FR")).messages,
+                locale: (await import("@goauthentik/locales/fr_FR")).messages,
                 plurals: (await import("make-plural/plurals")).fr,
             };
         },
@@ -52,7 +51,7 @@ export const LOCALES: {
         label: t`Turkish`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/tr")).messages,
+                locale: (await import("@goauthentik/locales/tr")).messages,
                 plurals: (await import("make-plural/plurals")).tr,
             };
         },
@@ -62,7 +61,7 @@ export const LOCALES: {
         label: t`Spanish`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/es")).messages,
+                locale: (await import("@goauthentik/locales/es")).messages,
                 plurals: (await import("make-plural/plurals")).es,
             };
         },
@@ -72,7 +71,7 @@ export const LOCALES: {
         label: t`Polish`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/pl")).messages,
+                locale: (await import("@goauthentik/locales/pl")).messages,
                 plurals: (await import("make-plural/plurals")).pl,
             };
         },
@@ -82,7 +81,7 @@ export const LOCALES: {
         label: t`Taiwanese Mandarin`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/zh_TW")).messages,
+                locale: (await import("@goauthentik/locales/zh_TW")).messages,
                 plurals: (await import("make-plural/plurals")).zh,
             };
         },
@@ -92,7 +91,7 @@ export const LOCALES: {
         label: t`Chinese (simplified)`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/zh-Hans")).messages,
+                locale: (await import("@goauthentik/locales/zh-Hans")).messages,
                 plurals: (await import("make-plural/plurals")).zh,
             };
         },
@@ -102,7 +101,7 @@ export const LOCALES: {
         label: t`Chinese (traditional)`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/zh-Hant")).messages,
+                locale: (await import("@goauthentik/locales/zh-Hant")).messages,
                 plurals: (await import("make-plural/plurals")).zh,
             };
         },
@@ -112,7 +111,7 @@ export const LOCALES: {
         label: t`German`,
         locale: async () => {
             return {
-                locale: (await import("@goauthentik/web/locales/de")).messages,
+                locale: (await import("@goauthentik/locales/de")).messages,
                 plurals: (await import("make-plural/plurals")).de,
             };
         },
@@ -165,13 +164,11 @@ export function activateLocale(code: string) {
         i18n.loadLocaleData(locale.code, { plurals: localeData.plurals });
         i18n.load(locale.code, localeData.locale);
         i18n.activate(locale.code);
-        document.querySelectorAll("[data-refresh-on-locale=true]").forEach((el) => {
-            try {
-                (el as LitElement).requestUpdate();
-            } catch {
-                console.debug(`authentik/locale: failed to update element ${el}`);
-            }
-        });
+        window.dispatchEvent(
+            new CustomEvent(EVENT_LOCALE_CHANGE, {
+                bubbles: true,
+                composed: true,
+            }),
+        );
     });
 }
-autoDetectLanguage();
diff --git a/web/src/api/Users.ts b/web/src/common/users.ts
similarity index 93%
rename from web/src/api/Users.ts
rename to web/src/common/users.ts
index bde307563..a94950a44 100644
--- a/web/src/api/Users.ts
+++ b/web/src/common/users.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { activateLocale } from "@goauthentik/web/interfaces/locale";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { activateLocale } from "@goauthentik/common/ui/locale";
 
 import { CoreApi, ResponseError, SessionUser } from "@goauthentik/api";
 
diff --git a/web/src/utils.ts b/web/src/common/utils.ts
similarity index 88%
rename from web/src/utils.ts
rename to web/src/common/utils.ts
index 2880adae5..27090bcbb 100644
--- a/web/src/utils.ts
+++ b/web/src/common/utils.ts
@@ -1,9 +1,4 @@
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import "@goauthentik/web/elements/EmptyState";
-
-import { t } from "@lingui/macro";
-
-import { TemplateResult, html } from "lit";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
 
 export function getCookie(name: string): string {
     let cookieValue = "";
@@ -42,13 +37,6 @@ export function truncate(input?: string, max = 10): string {
     return array.slice(0, max).join(" ") + ellipsis;
 }
 
-export function loading<T>(v: T, actual: TemplateResult): TemplateResult {
-    if (!v) {
-        return html`<ak-empty-state ?loading="${true}" header=${t`Loading`}> </ak-empty-state>`;
-    }
-    return actual;
-}
-
 export function camelToSnake(key: string): string {
     const result = key.replace(/([A-Z])/g, " $1");
     return result.split(" ").join("_").toLowerCase();
diff --git a/web/src/common/ws.ts b/web/src/common/ws.ts
index 893f16cc4..5028feaa7 100644
--- a/web/src/common/ws.ts
+++ b/web/src/common/ws.ts
@@ -1,6 +1,5 @@
-import { EVENT_WS_MESSAGE } from "@goauthentik/web/constants";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { EVENT_MESSAGE, EVENT_WS_MESSAGE } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
 
 import { t } from "@lingui/macro";
 
@@ -33,12 +32,15 @@ export class WebsocketClient {
         this.messageSocket.addEventListener("close", (e) => {
             console.debug(`authentik/ws: closed ws connection: ${e}`);
             if (this.retryDelay > 6000) {
-                showMessage(
-                    {
-                        level: MessageLevel.error,
-                        message: t`Connection error, reconnecting...`,
-                    },
-                    true,
+                window.dispatchEvent(
+                    new CustomEvent(EVENT_MESSAGE, {
+                        bubbles: true,
+                        composed: true,
+                        detail: {
+                            level: MessageLevel.error,
+                            message: t`Connection error, reconnecting...`,
+                        },
+                    }),
                 );
             }
             setTimeout(() => {
diff --git a/web/src/elements/Base.ts b/web/src/elements/Base.ts
new file mode 100644
index 000000000..477bfe36b
--- /dev/null
+++ b/web/src/elements/Base.ts
@@ -0,0 +1,19 @@
+import { EVENT_LOCALE_CHANGE } from "@goauthentik/common/constants";
+
+import { LitElement } from "lit";
+
+export class AKElement extends LitElement {
+    constructor() {
+        super();
+        this.addEventListener(EVENT_LOCALE_CHANGE, this._handleLocaleChange);
+    }
+
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        this.removeEventListener(EVENT_LOCALE_CHANGE, this._handleLocaleChange);
+    }
+
+    private _handleLocaleChange() {
+        this.requestUpdate();
+    }
+}
diff --git a/web/src/elements/CodeMirror.ts b/web/src/elements/CodeMirror.ts
index a1ec1260a..ba9350eca 100644
--- a/web/src/elements/CodeMirror.ts
+++ b/web/src/elements/CodeMirror.ts
@@ -12,13 +12,13 @@ import {
 import * as yamlMode from "@codemirror/legacy-modes/mode/yaml";
 import { Compartment, EditorState, Extension } from "@codemirror/state";
 import { EditorView, keymap, lineNumbers } from "@codemirror/view";
+import { AKElement } from "@goauthentik/elements/Base";
 import YAML from "yaml";
 
-import { LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 @customElement("ak-codemirror")
-export class CodeMirrorTextarea extends LitElement {
+export class CodeMirrorTextarea extends AKElement {
     @property({ type: Boolean })
     readOnly = false;
 
diff --git a/web/src/elements/Divider.ts b/web/src/elements/Divider.ts
index f318be964..7e184bf22 100644
--- a/web/src/elements/Divider.ts
+++ b/web/src/elements/Divider.ts
@@ -1,11 +1,13 @@
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-divider")
-export class Divider extends LitElement {
+export class Divider extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts
index 4e3d32a21..c6cf6efdc 100644
--- a/web/src/elements/EmptyState.ts
+++ b/web/src/elements/EmptyState.ts
@@ -1,15 +1,16 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFSize } from "@goauthentik/elements/Spinner";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-empty-state")
-export class EmptyState extends LitElement {
+export class EmptyState extends AKElement {
     @property({ type: String })
     icon = "";
 
diff --git a/web/src/elements/Expand.ts b/web/src/elements/Expand.ts
index f1147bd19..d3b1005b9 100644
--- a/web/src/elements/Expand.ts
+++ b/web/src/elements/Expand.ts
@@ -1,12 +1,14 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFExpandableSection from "@patternfly/patternfly/components/ExpandableSection/expandable-section.css";
 
 @customElement("ak-expand")
-export class Expand extends LitElement {
+export class Expand extends AKElement {
     @property({ type: Boolean })
     expanded = false;
 
diff --git a/web/src/elements/Label.ts b/web/src/elements/Label.ts
index 790c52147..f0ece9bed 100644
--- a/web/src/elements/Label.ts
+++ b/web/src/elements/Label.ts
@@ -1,7 +1,9 @@
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFLabel from "@patternfly/patternfly/components/Label/label.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
@@ -13,7 +15,7 @@ export enum PFColor {
 }
 
 @customElement("ak-label")
-export class Label extends LitElement {
+export class Label extends AKElement {
     @property()
     color: PFColor = PFColor.Grey;
 
diff --git a/web/src/elements/LoadingOverlay.ts b/web/src/elements/LoadingOverlay.ts
index a463e968f..a014a6005 100644
--- a/web/src/elements/LoadingOverlay.ts
+++ b/web/src/elements/LoadingOverlay.ts
@@ -1,12 +1,13 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFSize } from "@goauthentik/elements/Spinner";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-loading-overlay")
-export class LoadingOverlay extends LitElement {
+export class LoadingOverlay extends AKElement {
     @property({ type: Boolean })
     topMost = false;
 
diff --git a/web/src/elements/Markdown.ts b/web/src/elements/Markdown.ts
index b52b7541f..5078e478a 100644
--- a/web/src/elements/Markdown.ts
+++ b/web/src/elements/Markdown.ts
@@ -1,8 +1,10 @@
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
 
@@ -13,7 +15,7 @@ export interface MarkdownDocument {
 }
 
 @customElement("ak-markdown")
-export class Markdown extends LitElement {
+export class Markdown extends AKElement {
     @property({ attribute: false })
     md?: MarkdownDocument;
 
diff --git a/web/src/elements/PageHeader.ts b/web/src/elements/PageHeader.ts
index e5fcffd46..b7760dc4d 100644
--- a/web/src/elements/PageHeader.ts
+++ b/web/src/elements/PageHeader.ts
@@ -1,20 +1,21 @@
-import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config";
-import { currentInterface } from "@goauthentik/web/api/Sentry";
-import { me } from "@goauthentik/web/api/Users";
+import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
 import {
     EVENT_API_DRAWER_TOGGLE,
     EVENT_NOTIFICATION_DRAWER_TOGGLE,
     EVENT_SIDEBAR_TOGGLE,
     EVENT_WS_MESSAGE,
     TITLE_DEFAULT,
-} from "@goauthentik/web/constants";
+} from "@goauthentik/common/constants";
+import { currentInterface } from "@goauthentik/common/sentry";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
@@ -23,7 +24,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { EventsApi } from "@goauthentik/api";
 
 @customElement("ak-page-header")
-export class PageHeader extends LitElement {
+export class PageHeader extends AKElement {
     @property()
     icon?: string;
 
diff --git a/web/src/elements/SearchSelect.ts b/web/src/elements/SearchSelect.ts
index 9eda7fc64..7b54adee4 100644
--- a/web/src/elements/SearchSelect.ts
+++ b/web/src/elements/SearchSelect.ts
@@ -1,16 +1,18 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFSelect from "@patternfly/patternfly/components/Select/select.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-search-select")
-export class SearchSelect<T> extends LitElement {
+export class SearchSelect<T> extends AKElement {
     @property()
     query?: string;
 
diff --git a/web/src/elements/Spinner.ts b/web/src/elements/Spinner.ts
index de81902cd..2c8931c3e 100644
--- a/web/src/elements/Spinner.ts
+++ b/web/src/elements/Spinner.ts
@@ -1,6 +1,8 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css";
@@ -13,7 +15,7 @@ export enum PFSize {
 }
 
 @customElement("ak-spinner")
-export class Spinner extends LitElement {
+export class Spinner extends AKElement {
     @property()
     size: PFSize = PFSize.Medium;
 
diff --git a/web/src/elements/Tabs.ts b/web/src/elements/Tabs.ts
index 8d5602507..f03fe5604 100644
--- a/web/src/elements/Tabs.ts
+++ b/web/src/elements/Tabs.ts
@@ -1,18 +1,19 @@
-import { CURRENT_CLASS, EVENT_REFRESH, ROUTE_SEPARATOR } from "@goauthentik/web/constants";
-import { getURLParams, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
+import { CURRENT_CLASS, EVENT_REFRESH, ROUTE_SEPARATOR } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import { getURLParams, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFTabs from "@patternfly/patternfly/components/Tabs/tabs.css";
 import PFGlobal from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-tabs")
-export class Tabs extends LitElement {
+export class Tabs extends AKElement {
     @property()
     pageIdentifier = "page";
 
diff --git a/web/src/elements/Tooltip.ts b/web/src/elements/Tooltip.ts
index b57b359a9..67390e854 100644
--- a/web/src/elements/Tooltip.ts
+++ b/web/src/elements/Tooltip.ts
@@ -1,12 +1,14 @@
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFTooltip from "@patternfly/patternfly/components/Tooltip/tooltip.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-tooltip")
-export class Tooltip extends LitElement {
+export class Tooltip extends AKElement {
     @state()
     open = false;
 
diff --git a/web/src/elements/TreeView.ts b/web/src/elements/TreeView.ts
index f1fadb586..687ed2183 100644
--- a/web/src/elements/TreeView.ts
+++ b/web/src/elements/TreeView.ts
@@ -1,12 +1,13 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { setURLParams } from "@goauthentik/web/elements/router/RouteMatch";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import { setURLParams } from "@goauthentik/elements/router/RouteMatch";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFTreeView from "@patternfly/patternfly/components/TreeView/tree-view.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
@@ -19,7 +20,7 @@ export interface TreeViewItem {
 }
 
 @customElement("ak-treeview-node")
-export class TreeViewNode extends LitElement {
+export class TreeViewNode extends AKElement {
     @property({ attribute: false })
     item?: TreeViewItem;
 
@@ -136,7 +137,7 @@ export class TreeViewNode extends LitElement {
 }
 
 @customElement("ak-treeview")
-export class TreeView extends LitElement {
+export class TreeView extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, PFTreeView, AKGlobal];
     }
diff --git a/web/src/elements/buttons/ActionButton.ts b/web/src/elements/buttons/ActionButton.ts
index aa21e50b2..d64a1e586 100644
--- a/web/src/elements/buttons/ActionButton.ts
+++ b/web/src/elements/buttons/ActionButton.ts
@@ -1,6 +1,6 @@
-import { SpinnerButton } from "@goauthentik/web/elements/buttons/SpinnerButton";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { SpinnerButton } from "@goauthentik/elements/buttons/SpinnerButton";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { customElement, property } from "lit/decorators.js";
 
diff --git a/web/src/elements/buttons/Dropdown.ts b/web/src/elements/buttons/Dropdown.ts
index 39cd471c3..bcfc29c48 100644
--- a/web/src/elements/buttons/Dropdown.ts
+++ b/web/src/elements/buttons/Dropdown.ts
@@ -1,10 +1,11 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
 
-import { LitElement, TemplateResult, html } from "lit";
+import { TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
 @customElement("ak-dropdown")
-export class DropdownButton extends LitElement {
+export class DropdownButton extends AKElement {
     menu: HTMLElement | null;
 
     constructor() {
diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts
index b5a0f7b97..6cb4991aa 100644
--- a/web/src/elements/buttons/ModalButton.ts
+++ b/web/src/elements/buttons/ModalButton.ts
@@ -1,9 +1,10 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFSize } from "@goauthentik/elements/Spinner";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -34,7 +35,7 @@ export const MODAL_BUTTON_STYLES = css`
 `;
 
 @customElement("ak-modal-button")
-export class ModalButton extends LitElement {
+export class ModalButton extends AKElement {
     @property()
     size: PFSize = PFSize.Large;
 
@@ -99,7 +100,7 @@ export class ModalButton extends LitElement {
         this.open = true;
         this.querySelectorAll("*").forEach((child) => {
             if ("requestUpdate" in child) {
-                (child as LitElement).requestUpdate();
+                (child as AKElement).requestUpdate();
             }
         });
     }
diff --git a/web/src/elements/buttons/SpinnerButton.ts b/web/src/elements/buttons/SpinnerButton.ts
index 9bfead5af..556a6d516 100644
--- a/web/src/elements/buttons/SpinnerButton.ts
+++ b/web/src/elements/buttons/SpinnerButton.ts
@@ -1,16 +1,17 @@
-import { ERROR_CLASS, PROGRESS_CLASS, SUCCESS_CLASS } from "@goauthentik/web/constants";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
+import { ERROR_CLASS, PROGRESS_CLASS, SUCCESS_CLASS } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFSize } from "@goauthentik/elements/Spinner";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-spinner-button")
-export class SpinnerButton extends LitElement {
+export class SpinnerButton extends AKElement {
     @property({ type: Boolean })
     isRunning = false;
 
diff --git a/web/src/elements/buttons/TokenCopyButton.ts b/web/src/elements/buttons/TokenCopyButton.ts
index 08a1eb056..66b717ec1 100644
--- a/web/src/elements/buttons/TokenCopyButton.ts
+++ b/web/src/elements/buttons/TokenCopyButton.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { ERROR_CLASS, SECONDARY_CLASS, SUCCESS_CLASS } from "@goauthentik/web/constants";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import { ActionButton } from "@goauthentik/web/elements/buttons/ActionButton";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { ERROR_CLASS, SECONDARY_CLASS, SUCCESS_CLASS } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import { ActionButton } from "@goauthentik/elements/buttons/ActionButton";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
diff --git a/web/src/elements/cards/AggregateCard.ts b/web/src/elements/cards/AggregateCard.ts
index b619f8769..36c5883e4 100644
--- a/web/src/elements/cards/AggregateCard.ts
+++ b/web/src/elements/cards/AggregateCard.ts
@@ -1,14 +1,16 @@
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-aggregate-card")
-export class AggregateCard extends LitElement {
+export class AggregateCard extends AKElement {
     @property()
     icon?: string;
 
diff --git a/web/src/elements/cards/AggregatePromiseCard.ts b/web/src/elements/cards/AggregatePromiseCard.ts
index f70b61a03..f2ff0dcd4 100644
--- a/web/src/elements/cards/AggregatePromiseCard.ts
+++ b/web/src/elements/cards/AggregatePromiseCard.ts
@@ -1,6 +1,6 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/Spinner";
-import { AggregateCard } from "@goauthentik/web/elements/cards/AggregateCard";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/Spinner";
+import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard";
 
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
diff --git a/web/src/elements/charts/AdminLoginsChart.ts b/web/src/elements/charts/AdminLoginsChart.ts
index 258d27ff5..f4b3b756c 100644
--- a/web/src/elements/charts/AdminLoginsChart.ts
+++ b/web/src/elements/charts/AdminLoginsChart.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/elements/charts/AdminModelPerDay.ts b/web/src/elements/charts/AdminModelPerDay.ts
index 7db6e8c71..12c20e393 100644
--- a/web/src/elements/charts/AdminModelPerDay.ts
+++ b/web/src/elements/charts/AdminModelPerDay.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData, Tick } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/elements/charts/ApplicationAuthorizeChart.ts b/web/src/elements/charts/ApplicationAuthorizeChart.ts
index 3870b7ecb..cf70db6f3 100644
--- a/web/src/elements/charts/ApplicationAuthorizeChart.ts
+++ b/web/src/elements/charts/ApplicationAuthorizeChart.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/elements/charts/Chart.ts b/web/src/elements/charts/Chart.ts
index 2087fc35a..f4143af87 100644
--- a/web/src/elements/charts/Chart.ts
+++ b/web/src/elements/charts/Chart.ts
@@ -1,8 +1,9 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
 import {
     FONT_COLOUR_DARK_MODE,
     FONT_COLOUR_LIGHT_MODE,
-} from "@goauthentik/web/pages/flows/FlowDiagram";
+} from "@goauthentik/admin/flows/FlowDiagram";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
 import { Chart, ChartConfiguration, ChartData, ChartOptions, Plugin, Tick } from "chart.js";
 import { Legend, Tooltip } from "chart.js";
 import { BarController, DoughnutController, LineController } from "chart.js";
@@ -12,7 +13,7 @@ import "chartjs-adapter-moment";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { property } from "lit/decorators.js";
 
 Chart.register(Legend, Tooltip);
@@ -20,7 +21,7 @@ Chart.register(LineController, BarController, DoughnutController);
 Chart.register(ArcElement, BarElement);
 Chart.register(TimeScale, LinearScale);
 
-export abstract class AKChart<T> extends LitElement {
+export abstract class AKChart<T> extends AKElement {
     abstract apiRequest(): Promise<T>;
     abstract getChartData(data: T): ChartData;
 
diff --git a/web/src/elements/charts/UserChart.ts b/web/src/elements/charts/UserChart.ts
index aa3762b24..bad3ff02d 100644
--- a/web/src/elements/charts/UserChart.ts
+++ b/web/src/elements/charts/UserChart.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { AKChart } from "@goauthentik/web/elements/charts/Chart";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { AKChart } from "@goauthentik/elements/charts/Chart";
 import { ChartData } from "chart.js";
 
 import { t } from "@lingui/macro";
diff --git a/web/src/elements/chips/Chip.ts b/web/src/elements/chips/Chip.ts
index 1c0ac8487..4aa786f72 100644
--- a/web/src/elements/chips/Chip.ts
+++ b/web/src/elements/chips/Chip.ts
@@ -1,13 +1,15 @@
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFChip from "@patternfly/patternfly/components/Chip/chip.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-chip")
-export class Chip extends LitElement {
+export class Chip extends AKElement {
     @property()
     value?: number | string;
 
diff --git a/web/src/elements/chips/ChipGroup.ts b/web/src/elements/chips/ChipGroup.ts
index f30435358..4222d61d6 100644
--- a/web/src/elements/chips/ChipGroup.ts
+++ b/web/src/elements/chips/ChipGroup.ts
@@ -1,16 +1,17 @@
-import { Chip } from "@goauthentik/web/elements/chips/Chip";
+import { AKElement } from "@goauthentik/elements/Base";
+import { Chip } from "@goauthentik/elements/chips/Chip";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFChip from "@patternfly/patternfly/components/Chip/chip.css";
 import PFChipGroup from "@patternfly/patternfly/components/ChipGroup/chip-group.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-chip-group")
-export class ChipGroup extends LitElement {
+export class ChipGroup extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/events/ObjectChangelog.ts b/web/src/elements/events/ObjectChangelog.ts
index 21f718adf..164afb585 100644
--- a/web/src/elements/events/ObjectChangelog.ts
+++ b/web/src/elements/events/ObjectChangelog.ts
@@ -1,13 +1,13 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EventWithContext } from "@goauthentik/web/api/Events";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/Dropdown";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/pages/events/EventInfo";
+import "@goauthentik/admin/events/EventInfo";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EventWithContext } from "@goauthentik/common/events";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/Dropdown";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -41,7 +41,7 @@ export class ObjectChangelog extends Table<Event> {
         return this._targetModelName;
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<Event>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Event>> {
         let modelName = this._targetModelName;
         let appName = this.targetModelApp;
         if (this._targetModelName.indexOf(".") !== -1) {
diff --git a/web/src/elements/events/UserEvents.ts b/web/src/elements/events/UserEvents.ts
index 1bea3b120..801e851bb 100644
--- a/web/src/elements/events/UserEvents.ts
+++ b/web/src/elements/events/UserEvents.ts
@@ -1,13 +1,14 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EventWithContext } from "@goauthentik/web/api/Events";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/../pages/events/EventInfo";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/buttons/Dropdown";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
+import "@goauthentik/admin/events/EventInfo";
+import "@goauthentik/admin/events/EventInfo";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EventWithContext } from "@goauthentik/common/events";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/buttons/Dropdown";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -26,7 +27,7 @@ export class ObjectChangelog extends Table<Event> {
     @property()
     targetUser!: string;
 
-    async apiEndpoint(page: number): Promise<AKResponse<Event>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Event>> {
         return new EventsApi(DEFAULT_CONFIG).eventsEventsList({
             page: page,
             ordering: this.order,
diff --git a/web/src/elements/forms/ConfirmationForm.ts b/web/src/elements/forms/ConfirmationForm.ts
index 72f80f496..ee35097e2 100644
--- a/web/src/elements/forms/ConfirmationForm.ts
+++ b/web/src/elements/forms/ConfirmationForm.ts
@@ -1,8 +1,8 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts
index 4c5268ae9..654431712 100644
--- a/web/src/elements/forms/DeleteBulkForm.ts
+++ b/web/src/elements/forms/DeleteBulkForm.ts
@@ -1,11 +1,11 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -41,7 +41,7 @@ export class DeleteObjectsTable<T> extends Table<T> {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async apiEndpoint(page: number): Promise<AKResponse<T>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<T>> {
         return Promise.resolve({
             pagination: {
                 count: this.objects.length,
diff --git a/web/src/elements/forms/DeleteForm.ts b/web/src/elements/forms/DeleteForm.ts
index de957505c..f7bb7db1e 100644
--- a/web/src/elements/forms/DeleteForm.ts
+++ b/web/src/elements/forms/DeleteForm.ts
@@ -1,8 +1,8 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts
index d4b9b7990..486b5bc48 100644
--- a/web/src/elements/forms/Form.ts
+++ b/web/src/elements/forms/Form.ts
@@ -1,17 +1,18 @@
-import { SearchSelect } from "@goauthentik/web/SearchSelect";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { HorizontalFormElement } from "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { camelToSnake, convertToSlug } from "@goauthentik/web/utils";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { camelToSnake, convertToSlug } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import { SearchSelect } from "@goauthentik/elements/SearchSelect";
+import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 import "@polymer/iron-form/iron-form";
 import { IronFormElement } from "@polymer/iron-form/iron-form";
 import "@polymer/paper-input/paper-input";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -33,7 +34,7 @@ export interface KeyUnknown {
 }
 
 @customElement("ak-form")
-export class Form<T> extends LitElement {
+export class Form<T> extends AKElement {
     viewportCheck = true;
 
     @property()
diff --git a/web/src/elements/forms/FormElement.ts b/web/src/elements/forms/FormElement.ts
index 4129b81f4..b910caa90 100644
--- a/web/src/elements/forms/FormElement.ts
+++ b/web/src/elements/forms/FormElement.ts
@@ -1,4 +1,6 @@
-import { CSSResult, LitElement } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult } from "lit";
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
@@ -8,7 +10,7 @@ import PFFormControl from "@patternfly/patternfly/components/FormControl/form-co
 import { ErrorDetail } from "@goauthentik/api";
 
 @customElement("ak-form-element")
-export class FormElement extends LitElement {
+export class FormElement extends AKElement {
     static get styles(): CSSResult[] {
         return [PFForm, PFFormControl];
     }
diff --git a/web/src/elements/forms/FormGroup.ts b/web/src/elements/forms/FormGroup.ts
index 0fb57fa2e..e08aaf6dc 100644
--- a/web/src/elements/forms/FormGroup.ts
+++ b/web/src/elements/forms/FormGroup.ts
@@ -1,14 +1,16 @@
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-form-group")
-export class FormGroup extends LitElement {
+export class FormGroup extends AKElement {
     @property({ type: Boolean })
     expanded = false;
 
diff --git a/web/src/elements/forms/HorizontalFormElement.ts b/web/src/elements/forms/HorizontalFormElement.ts
index 78de590ce..b7732ce08 100644
--- a/web/src/elements/forms/HorizontalFormElement.ts
+++ b/web/src/elements/forms/HorizontalFormElement.ts
@@ -1,19 +1,20 @@
-import { FormGroup } from "@goauthentik/web/elements/forms/FormGroup";
-import { convertToSlug } from "@goauthentik/web/utils";
+import { convertToSlug } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import { FormGroup } from "@goauthentik/elements/forms/FormGroup";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, css } from "lit";
+import { CSSResult, css } from "lit";
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-form-element-horizontal")
-export class HorizontalFormElement extends LitElement {
+export class HorizontalFormElement extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/forms/ModalForm.ts b/web/src/elements/forms/ModalForm.ts
index 6d5017a7a..25658b829 100644
--- a/web/src/elements/forms/ModalForm.ts
+++ b/web/src/elements/forms/ModalForm.ts
@@ -1,8 +1,8 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/LoadingOverlay";
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import { Form } from "@goauthentik/web/elements/forms/Form";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import "@goauthentik/elements/LoadingOverlay";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import { Form } from "@goauthentik/elements/forms/Form";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/forms/ModelForm.ts b/web/src/elements/forms/ModelForm.ts
index 7ba51ac1c..0bb0234ae 100644
--- a/web/src/elements/forms/ModelForm.ts
+++ b/web/src/elements/forms/ModelForm.ts
@@ -1,5 +1,5 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { Form } from "@goauthentik/web/elements/forms/Form";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { Form } from "@goauthentik/elements/forms/Form";
 
 import { TemplateResult } from "lit";
 import { property } from "lit/decorators.js";
diff --git a/web/src/elements/forms/ProxyForm.ts b/web/src/elements/forms/ProxyForm.ts
index 5930e6b4e..cff67901e 100644
--- a/web/src/elements/forms/ProxyForm.ts
+++ b/web/src/elements/forms/ProxyForm.ts
@@ -1,4 +1,4 @@
-import { Form } from "@goauthentik/web/elements/forms/Form";
+import { Form } from "@goauthentik/elements/forms/Form";
 
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
diff --git a/web/src/elements/messages/Message.ts b/web/src/elements/messages/Message.ts
index 7811dd206..8265749dd 100644
--- a/web/src/elements/messages/Message.ts
+++ b/web/src/elements/messages/Message.ts
@@ -1,4 +1,7 @@
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
@@ -6,12 +9,6 @@ import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-gro
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-export enum MessageLevel {
-    error = "error",
-    warning = "warning",
-    success = "success",
-    info = "info",
-}
 export interface APIMessage {
     level: MessageLevel;
     tags?: string;
@@ -27,7 +24,7 @@ const LEVEL_ICON_MAP: { [key: string]: string } = {
 };
 
 @customElement("ak-message")
-export class Message extends LitElement {
+export class Message extends AKElement {
     @property({ attribute: false })
     message?: APIMessage;
 
diff --git a/web/src/elements/messages/MessageContainer.ts b/web/src/elements/messages/MessageContainer.ts
index ba289d98f..459c71edd 100644
--- a/web/src/elements/messages/MessageContainer.ts
+++ b/web/src/elements/messages/MessageContainer.ts
@@ -1,10 +1,15 @@
-import { SentryIgnoredError } from "@goauthentik/web/common/errors";
-import { WSMessage } from "@goauthentik/web/common/ws";
-import { EVENT_WS_MESSAGE, WS_MSG_TYPE_MESSAGE } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/messages/Message";
-import { APIMessage } from "@goauthentik/web/elements/messages/Message";
+import {
+    EVENT_MESSAGE,
+    EVENT_WS_MESSAGE,
+    WS_MSG_TYPE_MESSAGE,
+} from "@goauthentik/common/constants";
+import { SentryIgnoredError } from "@goauthentik/common/errors";
+import { WSMessage } from "@goauthentik/common/ws";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/messages/Message";
+import { APIMessage } from "@goauthentik/elements/messages/Message";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css";
@@ -20,7 +25,7 @@ export function showMessage(message: APIMessage, unique = false): void {
 }
 
 @customElement("ak-message-container")
-export class MessageContainer extends LitElement {
+export class MessageContainer extends AKElement {
     @property({ attribute: false })
     messages: APIMessage[] = [];
 
@@ -43,6 +48,9 @@ export class MessageContainer extends LitElement {
             if (e.detail.message_type !== WS_MSG_TYPE_MESSAGE) return;
             this.addMessage(e.detail as unknown as APIMessage);
         }) as EventListener);
+        this.addEventListener(EVENT_MESSAGE, ((e: CustomEvent<APIMessage>) => {
+            this.addMessage(e.detail);
+        }) as EventListener);
     }
 
     addMessage(message: APIMessage, unique = false): void {
diff --git a/web/src/elements/messages/Middleware.ts b/web/src/elements/messages/Middleware.ts
index 228dce1bc..7907ca63f 100644
--- a/web/src/elements/messages/Middleware.ts
+++ b/web/src/elements/messages/Middleware.ts
@@ -1,5 +1,5 @@
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/notifications/APIDrawer.ts b/web/src/elements/notifications/APIDrawer.ts
index 71727e6f5..884e63026 100644
--- a/web/src/elements/notifications/APIDrawer.ts
+++ b/web/src/elements/notifications/APIDrawer.ts
@@ -1,45 +1,21 @@
-import { EVENT_API_DRAWER_REFRESH, EVENT_API_DRAWER_TOGGLE } from "@goauthentik/web/constants";
+import { RequestInfo } from "@goauthentik/common/api/middleware";
+import { EVENT_API_DRAWER_TOGGLE, EVENT_REQUEST_POST } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css";
 import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import { Middleware, ResponseContext } from "@goauthentik/api";
-
-export interface RequestInfo {
-    method: string;
-    path: string;
-    status: number;
-}
-
-export class APIMiddleware implements Middleware {
-    post?(context: ResponseContext): Promise<Response | void> {
-        const request: RequestInfo = {
-            method: (context.init.method || "GET").toUpperCase(),
-            path: context.url,
-            status: context.response.status,
-        };
-        window.dispatchEvent(
-            new CustomEvent(EVENT_API_DRAWER_REFRESH, {
-                bubbles: true,
-                composed: true,
-                detail: request,
-            }),
-        );
-        return Promise.resolve(context.response);
-    }
-}
-
 @customElement("ak-api-drawer")
-export class APIDrawer extends LitElement {
+export class APIDrawer extends AKElement {
     @property({ attribute: false })
     requests: RequestInfo[] = [];
 
@@ -71,7 +47,7 @@ export class APIDrawer extends LitElement {
 
     constructor() {
         super();
-        window.addEventListener(EVENT_API_DRAWER_REFRESH, ((e: CustomEvent<RequestInfo>) => {
+        window.addEventListener(EVENT_REQUEST_POST, ((e: CustomEvent<RequestInfo>) => {
             this.requests.splice(0, 0, e.detail);
             if (this.requests.length > 50) {
                 this.requests.shift();
diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts
index 700ef9d43..854482627 100644
--- a/web/src/elements/notifications/NotificationDrawer.ts
+++ b/web/src/elements/notifications/NotificationDrawer.ts
@@ -1,17 +1,18 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "@goauthentik/web/constants";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { ActionToLabel } from "@goauthentik/web/pages/events/utils";
+import { ActionToLabel } from "@goauthentik/admin/events/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css";
@@ -21,9 +22,9 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { EventsApi, Notification } from "@goauthentik/api";
 
 @customElement("ak-notification-drawer")
-export class NotificationDrawer extends LitElement {
+export class NotificationDrawer extends AKElement {
     @property({ attribute: false })
-    notifications?: AKResponse<Notification>;
+    notifications?: PaginatedResponse<Notification>;
 
     @property({ type: Number })
     unread = 0;
diff --git a/web/src/elements/oauth/UserRefreshList.ts b/web/src/elements/oauth/UserRefreshList.ts
index 5f361a2df..13b189ebf 100644
--- a/web/src/elements/oauth/UserRefreshList.ts
+++ b/web/src/elements/oauth/UserRefreshList.ts
@@ -1,9 +1,9 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -25,7 +25,7 @@ export class UserOAuthRefreshList extends Table<RefreshTokenModel> {
         return super.styles.concat(PFFlex);
     }
 
-    async apiEndpoint(page: number): Promise<AKResponse<RefreshTokenModel>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<RefreshTokenModel>> {
         return new Oauth2Api(DEFAULT_CONFIG).oauth2RefreshTokensList({
             user: this.userId,
             ordering: "expires",
diff --git a/web/src/elements/router/Route.ts b/web/src/elements/router/Route.ts
index 763e13582..13ac61f8c 100644
--- a/web/src/elements/router/Route.ts
+++ b/web/src/elements/router/Route.ts
@@ -1,4 +1,4 @@
-import "@goauthentik/web/elements/EmptyState";
+import "@goauthentik/elements/EmptyState";
 
 import { TemplateResult, html } from "lit";
 import { until } from "lit/directives/until.js";
diff --git a/web/src/elements/router/RouteMatch.ts b/web/src/elements/router/RouteMatch.ts
index 2655cc087..95657b084 100644
--- a/web/src/elements/router/RouteMatch.ts
+++ b/web/src/elements/router/RouteMatch.ts
@@ -1,5 +1,5 @@
-import { ROUTE_SEPARATOR } from "@goauthentik/web/constants";
-import { Route } from "@goauthentik/web/elements/router/Route";
+import { ROUTE_SEPARATOR } from "@goauthentik/common/constants";
+import { Route } from "@goauthentik/elements/router/Route";
 
 import { TemplateResult } from "lit";
 
diff --git a/web/src/elements/router/Router404.ts b/web/src/elements/router/Router404.ts
index 0431abcf4..3312f2fd2 100644
--- a/web/src/elements/router/Router404.ts
+++ b/web/src/elements/router/Router404.ts
@@ -1,6 +1,8 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
@@ -8,7 +10,7 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-router-404")
-export class Router404 extends LitElement {
+export class Router404 extends AKElement {
     @property()
     url = "";
 
diff --git a/web/src/elements/router/RouterOutlet.ts b/web/src/elements/router/RouterOutlet.ts
index 7e4d915b1..215b57227 100644
--- a/web/src/elements/router/RouterOutlet.ts
+++ b/web/src/elements/router/RouterOutlet.ts
@@ -1,12 +1,13 @@
-import { ROUTE_SEPARATOR } from "@goauthentik/web/constants";
-import { Route } from "@goauthentik/web/elements/router/Route";
-import { RouteMatch } from "@goauthentik/web/elements/router/RouteMatch";
-import "@goauthentik/web/elements/router/Router404";
+import { ROUTE_SEPARATOR } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import { Route } from "@goauthentik/elements/router/Route";
+import { RouteMatch } from "@goauthentik/elements/router/RouteMatch";
+import "@goauthentik/elements/router/Router404";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 
 // Poliyfill for hashchange.newURL,
 // https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onhashchange
@@ -44,7 +45,7 @@ export function navigate(url: string, params?: { [key: string]: unknown }): void
 }
 
 @customElement("ak-router-outlet")
-export class RouterOutlet extends LitElement {
+export class RouterOutlet extends AKElement {
     @property({ attribute: false })
     current?: RouteMatch;
 
diff --git a/web/src/elements/sidebar/Sidebar.ts b/web/src/elements/sidebar/Sidebar.ts
index 9bdf182a6..ecc3e7351 100644
--- a/web/src/elements/sidebar/Sidebar.ts
+++ b/web/src/elements/sidebar/Sidebar.ts
@@ -1,16 +1,17 @@
-import "@goauthentik/web/elements/sidebar/SidebarBrand";
-import "@goauthentik/web/elements/sidebar/SidebarUser";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/sidebar/SidebarBrand";
+import "@goauthentik/elements/sidebar/SidebarUser";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-sidebar")
-export class Sidebar extends LitElement {
+export class Sidebar extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/sidebar/SidebarBrand.ts b/web/src/elements/sidebar/SidebarBrand.ts
index acee4d94d..c67112fc4 100644
--- a/web/src/elements/sidebar/SidebarBrand.ts
+++ b/web/src/elements/sidebar/SidebarBrand.ts
@@ -1,12 +1,13 @@
-import { tenant } from "@goauthentik/web/api/Config";
-import { configureSentry } from "@goauthentik/web/api/Sentry";
-import { EVENT_SIDEBAR_TOGGLE } from "@goauthentik/web/constants";
-import { first } from "@goauthentik/web/utils";
+import { tenant } from "@goauthentik/common/api/config";
+import { EVENT_SIDEBAR_TOGGLE } from "@goauthentik/common/constants";
+import { configureSentry } from "@goauthentik/common/sentry";
+import { first } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFGlobal from "@patternfly/patternfly/patternfly-base.css";
@@ -24,10 +25,11 @@ export const DefaultTenant: CurrentTenant = {
     brandingTitle: "authentik",
     uiFooterLinks: [],
     matchedDomain: "",
+    defaultLocale: "",
 };
 
 @customElement("ak-sidebar-brand")
-export class SidebarBrand extends LitElement {
+export class SidebarBrand extends AKElement {
     @property({ attribute: false })
     tenant: CurrentTenant = DefaultTenant;
 
diff --git a/web/src/elements/sidebar/SidebarItem.ts b/web/src/elements/sidebar/SidebarItem.ts
index 187537617..da2af9643 100644
--- a/web/src/elements/sidebar/SidebarItem.ts
+++ b/web/src/elements/sidebar/SidebarItem.ts
@@ -1,17 +1,18 @@
-import { ROUTE_SEPARATOR } from "@goauthentik/web/constants";
+import { ROUTE_SEPARATOR } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
 
-import { CSSResult, LitElement, css } from "lit";
+import { CSSResult, css } from "lit";
 import { TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-sidebar-item")
-export class SidebarItem extends LitElement {
+export class SidebarItem extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/sidebar/SidebarUser.ts b/web/src/elements/sidebar/SidebarUser.ts
index 90d5194b7..97cdad27b 100644
--- a/web/src/elements/sidebar/SidebarUser.ts
+++ b/web/src/elements/sidebar/SidebarUser.ts
@@ -1,6 +1,7 @@
-import { me } from "@goauthentik/web/api/Users";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
@@ -10,7 +11,7 @@ import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-sidebar-user")
-export class SidebarUser extends LitElement {
+export class SidebarUser extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/elements/table/Table.ts b/web/src/elements/table/Table.ts
index 57aae91c6..a2e780b24 100644
--- a/web/src/elements/table/Table.ts
+++ b/web/src/elements/table/Table.ts
@@ -1,21 +1,22 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/buttons/SpinnerButton";
-import "@goauthentik/web/elements/chips/Chip";
-import "@goauthentik/web/elements/chips/ChipGroup";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import "@goauthentik/web/elements/table/TablePagination";
-import "@goauthentik/web/elements/table/TableSearch";
-import { groupBy } from "@goauthentik/web/utils";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { groupBy } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/buttons/SpinnerButton";
+import "@goauthentik/elements/chips/Chip";
+import "@goauthentik/elements/chips/ChipGroup";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import "@goauthentik/elements/table/TablePagination";
+import { Pagination } from "@goauthentik/elements/table/TablePagination";
+import "@goauthentik/elements/table/TableSearch";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { property, state } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css";
 import PFPagination from "@patternfly/patternfly/components/Pagination/pagination.css";
@@ -88,8 +89,14 @@ export class TableColumn {
     }
 }
 
-export abstract class Table<T> extends LitElement {
-    abstract apiEndpoint(page: number): Promise<AKResponse<T>>;
+export interface PaginatedResponse<T> {
+    pagination: Pagination;
+
+    results: Array<T>;
+}
+
+export abstract class Table<T> extends AKElement {
+    abstract apiEndpoint(page: number): Promise<PaginatedResponse<T>>;
     abstract columns(): TableColumn[];
     abstract row(item: T): TemplateResult[];
 
@@ -108,7 +115,7 @@ export abstract class Table<T> extends LitElement {
     }
 
     @property({ attribute: false })
-    data?: AKResponse<T>;
+    data?: PaginatedResponse<T>;
 
     @property({ type: Number })
     page = 1;
diff --git a/web/src/elements/table/TableModal.ts b/web/src/elements/table/TableModal.ts
index 4625e2396..b26fe3697 100644
--- a/web/src/elements/table/TableModal.ts
+++ b/web/src/elements/table/TableModal.ts
@@ -1,12 +1,13 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import { MODAL_BUTTON_STYLES } from "@goauthentik/web/elements/buttons/ModalButton";
-import { Table } from "@goauthentik/web/elements/table/Table";
+import { AKElement } from "@goauthentik/elements/Base";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import { MODAL_BUTTON_STYLES } from "@goauthentik/elements/buttons/ModalButton";
+import { Table } from "@goauthentik/elements/table/Table";
 
-import { CSSResult, LitElement } from "lit";
+import { CSSResult } from "lit";
 import { TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css";
@@ -56,7 +57,7 @@ export abstract class TableModal<T> extends Table<T> {
         this.open = true;
         this.querySelectorAll("*").forEach((child) => {
             if ("requestUpdate" in child) {
-                (child as LitElement).requestUpdate();
+                (child as AKElement).requestUpdate();
             }
         });
     }
diff --git a/web/src/elements/table/TablePage.ts b/web/src/elements/table/TablePage.ts
index 104241506..28e25ca94 100644
--- a/web/src/elements/table/TablePage.ts
+++ b/web/src/elements/table/TablePage.ts
@@ -1,6 +1,6 @@
-import "@goauthentik/web/elements/../elements/PageHeader";
-import { updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import { Table } from "@goauthentik/web/elements/table/Table";
+import "@goauthentik/elements/PageHeader";
+import { updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import { Table } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/table/TablePagination.ts b/web/src/elements/table/TablePagination.ts
index f1d50d83c..c0e076379 100644
--- a/web/src/elements/table/TablePagination.ts
+++ b/web/src/elements/table/TablePagination.ts
@@ -1,19 +1,31 @@
-import { AKPagination } from "@goauthentik/web/api/Client";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFPagination from "@patternfly/patternfly/components/Pagination/pagination.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
+export interface Pagination {
+    next?: number;
+    previous?: number;
+
+    count: number;
+    current: number;
+    totalPages: number;
+
+    startIndex: number;
+    endIndex: number;
+}
+
 @customElement("ak-table-pagination")
-export class TablePagination extends LitElement {
+export class TablePagination extends AKElement {
     @property({ attribute: false })
-    pages?: AKPagination;
+    pages?: Pagination;
 
     @property({ attribute: false })
     // eslint-disable-next-line
diff --git a/web/src/elements/table/TableSearch.ts b/web/src/elements/table/TableSearch.ts
index c43e59ff4..56eba28f7 100644
--- a/web/src/elements/table/TableSearch.ts
+++ b/web/src/elements/table/TableSearch.ts
@@ -1,10 +1,12 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css";
@@ -12,7 +14,7 @@ import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-table-search")
-export class TableSearch extends LitElement {
+export class TableSearch extends AKElement {
     @property()
     value?: string;
 
diff --git a/web/src/elements/user/SessionList.ts b/web/src/elements/user/SessionList.ts
index f22995d69..6761bd92b 100644
--- a/web/src/elements/user/SessionList.ts
+++ b/web/src/elements/user/SessionList.ts
@@ -1,8 +1,8 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -16,7 +16,7 @@ export class AuthenticatedSessionList extends Table<AuthenticatedSession> {
     @property()
     targetUser!: string;
 
-    async apiEndpoint(page: number): Promise<AKResponse<AuthenticatedSession>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<AuthenticatedSession>> {
         return new CoreApi(DEFAULT_CONFIG).coreAuthenticatedSessionsList({
             userUsername: this.targetUser,
             ordering: this.order,
diff --git a/web/src/elements/user/UserConsentList.ts b/web/src/elements/user/UserConsentList.ts
index 87ffcdac9..d4ed4afb8 100644
--- a/web/src/elements/user/UserConsentList.ts
+++ b/web/src/elements/user/UserConsentList.ts
@@ -1,8 +1,8 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
 
 import { t } from "@lingui/macro";
 
@@ -16,7 +16,7 @@ export class UserConsentList extends Table<UserConsent> {
     @property({ type: Number })
     userId?: number;
 
-    async apiEndpoint(page: number): Promise<AKResponse<UserConsent>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<UserConsent>> {
         return new CoreApi(DEFAULT_CONFIG).coreUserConsentList({
             user: this.userId,
             ordering: this.order,
diff --git a/web/src/elements/user/UserDevicesList.ts b/web/src/elements/user/UserDevicesList.ts
index a47d32304..e57a8a223 100644
--- a/web/src/elements/user/UserDevicesList.ts
+++ b/web/src/elements/user/UserDevicesList.ts
@@ -1,11 +1,8 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import { TableColumn } from "@goauthentik/web/elements/table/Table";
-import {
-    MFADevicesPage,
-    deviceTypeName,
-} from "@goauthentik/web/user/user-settings/mfa/MFADevicesPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { TableColumn } from "@goauthentik/elements/table/Table";
+import { MFADevicesPage, deviceTypeName } from "@goauthentik/user/user-settings/mfa/MFADevicesPage";
 
 import { t } from "@lingui/macro";
 
@@ -20,7 +17,7 @@ export class UserDeviceList extends MFADevicesPage {
     userId?: number;
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async apiEndpoint(page: number): Promise<AKResponse<Device>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Device>> {
         return new AuthenticatorsApi(DEFAULT_CONFIG)
             .authenticatorsAdminAllList({
                 user: this.userId,
diff --git a/web/src/elements/utils/TimeDeltaHelp.ts b/web/src/elements/utils/TimeDeltaHelp.ts
index 033d1a5bd..aa50d0c18 100644
--- a/web/src/elements/utils/TimeDeltaHelp.ts
+++ b/web/src/elements/utils/TimeDeltaHelp.ts
@@ -1,17 +1,18 @@
-import "@goauthentik/web/elements/Tooltip";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Tooltip";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-utils-time-delta-help")
-export class TimeDeltaHelp extends LitElement {
+export class TimeDeltaHelp extends AKElement {
     @property({ type: Boolean })
     negative = false;
 
diff --git a/web/src/elements/wizard/ActionWizardPage.ts b/web/src/elements/wizard/ActionWizardPage.ts
index 9e4538b83..b88f28328 100644
--- a/web/src/elements/wizard/ActionWizardPage.ts
+++ b/web/src/elements/wizard/ActionWizardPage.ts
@@ -1,13 +1,13 @@
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { WizardAction } from "@goauthentik/web/elements/wizard/Wizard";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { WizardAction } from "@goauthentik/elements/wizard/Wizard";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFProgressStepper from "@patternfly/patternfly/components/ProgressStepper/progress-stepper.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
diff --git a/web/src/elements/wizard/FormWizardPage.ts b/web/src/elements/wizard/FormWizardPage.ts
index 8b65eace1..701ccce95 100644
--- a/web/src/elements/wizard/FormWizardPage.ts
+++ b/web/src/elements/wizard/FormWizardPage.ts
@@ -1,5 +1,5 @@
-import { Form } from "@goauthentik/web/elements/forms/Form";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import { Form } from "@goauthentik/elements/forms/Form";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/wizard/Wizard.ts b/web/src/elements/wizard/Wizard.ts
index b15c46e01..a2f3bcffd 100644
--- a/web/src/elements/wizard/Wizard.ts
+++ b/web/src/elements/wizard/Wizard.ts
@@ -1,6 +1,6 @@
-import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/wizard/ActionWizardPage";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/wizard/ActionWizardPage";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/elements/wizard/WizardFormPage.ts b/web/src/elements/wizard/WizardFormPage.ts
index bdf76b1b0..9983d7874 100644
--- a/web/src/elements/wizard/WizardFormPage.ts
+++ b/web/src/elements/wizard/WizardFormPage.ts
@@ -1,10 +1,10 @@
-import { Form, KeyUnknown } from "@goauthentik/web/elements/forms/Form";
-import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
+import { Form, KeyUnknown } from "@goauthentik/elements/forms/Form";
+import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
diff --git a/web/src/elements/wizard/WizardPage.ts b/web/src/elements/wizard/WizardPage.ts
index c71039fc2..93fdfed58 100644
--- a/web/src/elements/wizard/WizardPage.ts
+++ b/web/src/elements/wizard/WizardPage.ts
@@ -1,13 +1,14 @@
-import { Wizard } from "@goauthentik/web/elements/wizard/Wizard";
+import { AKElement } from "@goauthentik/elements/Base";
+import { Wizard } from "@goauthentik/elements/wizard/Wizard";
 
-import { CSSResult, LitElement, PropertyDeclaration, TemplateResult, html } from "lit";
+import { CSSResult, PropertyDeclaration, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-wizard-page")
-export class WizardPage extends LitElement {
+export class WizardPage extends AKElement {
     static get styles(): CSSResult[] {
         return [PFBase, AKGlobal];
     }
@@ -37,7 +38,7 @@ export class WizardPage extends LitElement {
     ): void {
         this.querySelectorAll("*").forEach((el) => {
             if ("requestUpdate" in el) {
-                (el as LitElement).requestUpdate();
+                (el as AKElement).requestUpdate();
             }
         });
         return super.requestUpdate(name, oldValue, options);
diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flow/FlowExecutor.ts
similarity index 90%
rename from web/src/flows/FlowExecutor.ts
rename to web/src/flow/FlowExecutor.ts
index ea11ab8bf..9030f683f 100644
--- a/web/src/flows/FlowExecutor.ts
+++ b/web/src/flow/FlowExecutor.ts
@@ -1,31 +1,32 @@
-import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config";
-import { globalAK } from "@goauthentik/web/api/Global";
-import { configureSentry } from "@goauthentik/web/api/Sentry";
-import { WebsocketClient } from "@goauthentik/web/common/ws";
-import { EVENT_FLOW_ADVANCE, TITLE_DEFAULT } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/LoadingOverlay";
-import "@goauthentik/web/flows/stages/RedirectStage";
-import "@goauthentik/web/flows/stages/access_denied/AccessDeniedStage";
+import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
+import { EVENT_FLOW_ADVANCE, TITLE_DEFAULT } from "@goauthentik/common/constants";
+import { globalAK } from "@goauthentik/common/global";
+import { configureSentry } from "@goauthentik/common/sentry";
+import { first } from "@goauthentik/common/utils";
+import { WebsocketClient } from "@goauthentik/common/ws";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/LoadingOverlay";
+import "@goauthentik/flow/stages/RedirectStage";
+import "@goauthentik/flow/stages/access_denied/AccessDeniedStage";
 // Import webauthn-related stages to prevent issues on safari
 // Which is overly sensitive to allowing things only in the context of a
 // user interaction
-import "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStage";
-import "@goauthentik/web/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage";
-import "@goauthentik/web/flows/stages/autosubmit/AutosubmitStage";
-import { StageHost } from "@goauthentik/web/flows/stages/base";
-import "@goauthentik/web/flows/stages/captcha/CaptchaStage";
-import "@goauthentik/web/flows/stages/identification/IdentificationStage";
-import "@goauthentik/web/flows/stages/password/PasswordStage";
-import { first } from "@goauthentik/web/utils";
+import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage";
+import "@goauthentik/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage";
+import "@goauthentik/flow/stages/autosubmit/AutosubmitStage";
+import { StageHost } from "@goauthentik/flow/stages/base";
+import "@goauthentik/flow/stages/captcha/CaptchaStage";
+import "@goauthentik/flow/stages/identification/IdentificationStage";
+import "@goauthentik/flow/stages/password/PasswordStage";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css";
@@ -47,7 +48,7 @@ import {
 } from "@goauthentik/api";
 
 @customElement("ak-flow-executor")
-export class FlowExecutor extends LitElement implements StageHost {
+export class FlowExecutor extends AKElement implements StageHost {
     flowSlug?: string;
 
     private _challenge?: ChallengeTypes;
@@ -291,19 +292,19 @@ export class FlowExecutor extends LitElement implements StageHost {
                     .challenge=${this.challenge}
                 ></ak-stage-captcha>`;
             case "ak-stage-consent":
-                await import("@goauthentik/web/flows/stages/consent/ConsentStage");
+                await import("@goauthentik/flow/stages/consent/ConsentStage");
                 return html`<ak-stage-consent
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-stage-consent>`;
             case "ak-stage-dummy":
-                await import("@goauthentik/web/flows/stages/dummy/DummyStage");
+                await import("@goauthentik/flow/stages/dummy/DummyStage");
                 return html`<ak-stage-dummy
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-stage-dummy>`;
             case "ak-stage-email":
-                await import("@goauthentik/web/flows/stages/email/EmailStage");
+                await import("@goauthentik/flow/stages/email/EmailStage");
                 return html`<ak-stage-email
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
@@ -315,30 +316,26 @@ export class FlowExecutor extends LitElement implements StageHost {
                     .challenge=${this.challenge}
                 ></ak-stage-autosubmit>`;
             case "ak-stage-prompt":
-                await import("@goauthentik/web/flows/stages/prompt/PromptStage");
+                await import("@goauthentik/flow/stages/prompt/PromptStage");
                 return html`<ak-stage-prompt
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-stage-prompt>`;
             case "ak-stage-authenticator-totp":
-                await import(
-                    "@goauthentik/web/flows/stages/authenticator_totp/AuthenticatorTOTPStage"
-                );
+                await import("@goauthentik/flow/stages/authenticator_totp/AuthenticatorTOTPStage");
                 return html`<ak-stage-authenticator-totp
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-stage-authenticator-totp>`;
             case "ak-stage-authenticator-duo":
-                await import(
-                    "@goauthentik/web/flows/stages/authenticator_duo/AuthenticatorDuoStage"
-                );
+                await import("@goauthentik/flow/stages/authenticator_duo/AuthenticatorDuoStage");
                 return html`<ak-stage-authenticator-duo
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-stage-authenticator-duo>`;
             case "ak-stage-authenticator-static":
                 await import(
-                    "@goauthentik/web/flows/stages/authenticator_static/AuthenticatorStaticStage"
+                    "@goauthentik/flow/stages/authenticator_static/AuthenticatorStaticStage"
                 );
                 return html`<ak-stage-authenticator-static
                     .host=${this as StageHost}
@@ -350,9 +347,7 @@ export class FlowExecutor extends LitElement implements StageHost {
                     .challenge=${this.challenge}
                 ></ak-stage-authenticator-webauthn>`;
             case "ak-stage-authenticator-sms":
-                await import(
-                    "@goauthentik/web/flows/stages/authenticator_sms/AuthenticatorSMSStage"
-                );
+                await import("@goauthentik/flow/stages/authenticator_sms/AuthenticatorSMSStage");
                 return html`<ak-stage-authenticator-sms
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
@@ -363,13 +358,13 @@ export class FlowExecutor extends LitElement implements StageHost {
                     .challenge=${this.challenge}
                 ></ak-stage-authenticator-validate>`;
             case "ak-flow-sources-plex":
-                await import("@goauthentik/web/flows/sources/plex/PlexLoginInit");
+                await import("@goauthentik/flow/sources/plex/PlexLoginInit");
                 return html`<ak-flow-sources-plex
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
                 ></ak-flow-sources-plex>`;
             case "ak-flow-sources-oauth-apple":
-                await import("@goauthentik/web/flows/sources/apple/AppleLoginInit");
+                await import("@goauthentik/flow/sources/apple/AppleLoginInit");
                 return html`<ak-flow-sources-oauth-apple
                     .host=${this as StageHost}
                     .challenge=${this.challenge}
@@ -420,7 +415,7 @@ export class FlowExecutor extends LitElement implements StageHost {
         if (!this.inspectorOpen) {
             return html``;
         }
-        await import("@goauthentik/web/flows/FlowInspector");
+        await import("@goauthentik/flow/FlowInspector");
         return html`<ak-flow-inspector
             class="pf-c-drawer__panel pf-m-width-33"
         ></ak-flow-inspector>`;
diff --git a/web/src/flows/FlowInspector.ts b/web/src/flow/FlowInspector.ts
similarity index 97%
rename from web/src/flows/FlowInspector.ts
rename to web/src/flow/FlowInspector.ts
index 40a13aa3d..bf2eb2278 100644
--- a/web/src/flows/FlowInspector.ts
+++ b/web/src/flow/FlowInspector.ts
@@ -1,13 +1,14 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_FLOW_ADVANCE } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/Expand";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_FLOW_ADVANCE } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Expand";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
 import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css";
@@ -18,7 +19,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { FlowInspection, FlowsApi, Stage } from "@goauthentik/api";
 
 @customElement("ak-flow-inspector")
-export class FlowInspector extends LitElement {
+export class FlowInspector extends AKElement {
     flowSlug: string;
 
     @property({ attribute: false })
diff --git a/web/src/flow/FlowInterface.ts b/web/src/flow/FlowInterface.ts
new file mode 100644
index 000000000..9cd9254c5
--- /dev/null
+++ b/web/src/flow/FlowInterface.ts
@@ -0,0 +1,5 @@
+import { autoDetectLanguage } from "@goauthentik/common/ui/locale";
+import "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/flow/FlowExecutor";
+
+autoDetectLanguage();
diff --git a/web/src/flows/FormStatic.ts b/web/src/flow/FormStatic.ts
similarity index 91%
rename from web/src/flows/FormStatic.ts
rename to web/src/flow/FormStatic.ts
index 70972a831..8ba7a8302 100644
--- a/web/src/flows/FormStatic.ts
+++ b/web/src/flow/FormStatic.ts
@@ -1,13 +1,15 @@
+import { AKElement } from "@goauthentik/elements/Base";
+
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 
 @customElement("ak-form-static")
-export class FormStatic extends LitElement {
+export class FormStatic extends AKElement {
     @property()
     userAvatar?: string;
 
diff --git a/web/src/flows/sources/apple/AppleLoginInit.ts b/web/src/flow/sources/apple/AppleLoginInit.ts
similarity index 94%
rename from web/src/flows/sources/apple/AppleLoginInit.ts
rename to web/src/flow/sources/apple/AppleLoginInit.ts
index eb11f8bbd..f271b4c9b 100644
--- a/web/src/flows/sources/apple/AppleLoginInit.ts
+++ b/web/src/flow/sources/apple/AppleLoginInit.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/EmptyState";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/sources/apple/apple.d.ts b/web/src/flow/sources/apple/apple.d.ts
similarity index 100%
rename from web/src/flows/sources/apple/apple.d.ts
rename to web/src/flow/sources/apple/apple.d.ts
diff --git a/web/src/flows/sources/plex/PlexLoginInit.ts b/web/src/flow/sources/plex/PlexLoginInit.ts
similarity index 87%
rename from web/src/flows/sources/plex/PlexLoginInit.ts
rename to web/src/flow/sources/plex/PlexLoginInit.ts
index 1d2ee15fe..d81022af0 100644
--- a/web/src/flows/sources/plex/PlexLoginInit.ts
+++ b/web/src/flow/sources/plex/PlexLoginInit.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { PlexAPIClient, popupCenterScreen } from "@goauthentik/web/api/Plex";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { PlexAPIClient, popupCenterScreen } from "@goauthentik/common/helpers/plex";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult } from "lit";
 import { TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/FlowErrorStage.ts b/web/src/flow/stages/FlowErrorStage.ts
similarity index 92%
rename from web/src/flows/stages/FlowErrorStage.ts
rename to web/src/flow/stages/FlowErrorStage.ts
index 1da0b3812..ccd75766b 100644
--- a/web/src/flows/stages/FlowErrorStage.ts
+++ b/web/src/flow/stages/FlowErrorStage.ts
@@ -1,6 +1,6 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -8,7 +8,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
diff --git a/web/src/flows/stages/RedirectStage.ts b/web/src/flow/stages/RedirectStage.ts
similarity index 94%
rename from web/src/flows/stages/RedirectStage.ts
rename to web/src/flow/stages/RedirectStage.ts
index dd5c483f6..372a40886 100644
--- a/web/src/flows/stages/RedirectStage.ts
+++ b/web/src/flow/stages/RedirectStage.ts
@@ -1,11 +1,11 @@
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/access_denied/AccessDeniedStage.ts b/web/src/flow/stages/access_denied/AccessDeniedStage.ts
similarity index 92%
rename from web/src/flows/stages/access_denied/AccessDeniedStage.ts
rename to web/src/flow/stages/access_denied/AccessDeniedStage.ts
index 366d54812..db506fe44 100644
--- a/web/src/flows/stages/access_denied/AccessDeniedStage.ts
+++ b/web/src/flow/stages/access_denied/AccessDeniedStage.ts
@@ -1,6 +1,6 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -8,7 +8,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
diff --git a/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
similarity index 92%
rename from web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts
rename to web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
index f6e73367c..7ecbcb06e 100644
--- a/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts
+++ b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_sms/AuthenticatorSMSStage.ts b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
similarity index 96%
rename from web/src/flows/stages/authenticator_sms/AuthenticatorSMSStage.ts
rename to web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
index 3970e906f..80f0b9b46 100644
--- a/web/src/flows/stages/authenticator_sms/AuthenticatorSMSStage.ts
+++ b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
@@ -1,7 +1,7 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -9,7 +9,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
diff --git a/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
similarity index 93%
rename from web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts
rename to web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
index f283d45f3..ff1c6cb0c 100644
--- a/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts
+++ b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
@@ -1,7 +1,7 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -9,7 +9,7 @@ import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
similarity index 92%
rename from web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts
rename to web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
index c6e4a2fb7..6f82fb8fc 100644
--- a/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts
+++ b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
@@ -1,9 +1,9 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import { MessageLevel } from "@goauthentik/common/messages";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 import "webcomponent-qr-code";
 
 import { t } from "@lingui/macro";
@@ -12,7 +12,7 @@ import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
similarity index 95%
rename from web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts
rename to web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
index 6460faac6..fcdc61ebc 100644
--- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
@@ -1,9 +1,9 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStageCode";
-import "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo";
-import "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn";
-import { BaseStage, StageHost } from "@goauthentik/web/flows/stages/base";
-import { PasswordManagerPrefill } from "@goauthentik/web/flows/stages/identification/IdentificationStage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageCode";
+import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo";
+import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn";
+import { BaseStage, StageHost } from "@goauthentik/flow/stages/base";
+import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage";
 
 import { t } from "@lingui/macro";
 
@@ -11,7 +11,7 @@ import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
similarity index 91%
rename from web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
rename to web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
index 612691146..854fa4884 100644
--- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
@@ -1,9 +1,9 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { AuthenticatorValidateStage } from "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStage";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
-import { PasswordManagerPrefill } from "@goauthentik/web/flows/stages/identification/IdentificationStage";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { AuthenticatorValidateStage } from "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage";
+import { BaseStage } from "@goauthentik/flow/stages/base";
+import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage";
 
 import { t } from "@lingui/macro";
 
@@ -11,7 +11,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
similarity index 90%
rename from web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
rename to web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
index a457b5ac0..845a15e75 100644
--- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
@@ -1,8 +1,8 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { AuthenticatorValidateStage } from "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStage";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { AuthenticatorValidateStage } from "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
similarity index 94%
rename from web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
rename to web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
index 55c9727d5..b395caf57 100644
--- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
@@ -1,16 +1,16 @@
-import { AuthenticatorValidateStage } from "@goauthentik/web/flows/stages/authenticator_validate/AuthenticatorValidateStage";
 import {
     transformAssertionForServer,
     transformCredentialRequestOptions,
-} from "@goauthentik/web/flows/stages/authenticator_webauthn/utils";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+} from "@goauthentik/common/helpers/webauthn";
+import { AuthenticatorValidateStage } from "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
diff --git a/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
similarity index 95%
rename from web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
rename to web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
index a19766d9a..f7b22f029 100644
--- a/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
+++ b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
@@ -1,17 +1,17 @@
-import { PFSize } from "@goauthentik/web/elements/Spinner";
 import {
     Assertion,
     transformCredentialCreateOptions,
     transformNewAssertionForServer,
-} from "@goauthentik/web/flows/stages/authenticator_webauthn/utils";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+} from "@goauthentik/common/helpers/webauthn";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/autosubmit/AutosubmitStage.ts b/web/src/flow/stages/autosubmit/AutosubmitStage.ts
similarity index 93%
rename from web/src/flows/stages/autosubmit/AutosubmitStage.ts
rename to web/src/flow/stages/autosubmit/AutosubmitStage.ts
index 612a8f177..9e9fb1929 100644
--- a/web/src/flows/stages/autosubmit/AutosubmitStage.ts
+++ b/web/src/flow/stages/autosubmit/AutosubmitStage.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/EmptyState";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/base.ts b/web/src/flow/stages/base.ts
similarity index 93%
rename from web/src/flows/stages/base.ts
rename to web/src/flow/stages/base.ts
index e1b03738a..07998299d 100644
--- a/web/src/flows/stages/base.ts
+++ b/web/src/flow/stages/base.ts
@@ -1,4 +1,6 @@
-import { LitElement, TemplateResult, html } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
 
 import { CurrentTenant, ErrorDetail } from "@goauthentik/api";
@@ -27,7 +29,7 @@ export type KeyUnknown = {
     [key: string]: unknown;
 };
 
-export class BaseStage<Tin, Tout> extends LitElement {
+export class BaseStage<Tin, Tout> extends AKElement {
     host!: StageHost;
 
     @property({ attribute: false })
diff --git a/web/src/flows/stages/captcha/CaptchaStage.ts b/web/src/flow/stages/captcha/CaptchaStage.ts
similarity index 91%
rename from web/src/flows/stages/captcha/CaptchaStage.ts
rename to web/src/flow/stages/captcha/CaptchaStage.ts
index 14aa8b105..21637f08c 100644
--- a/web/src/flows/stages/captcha/CaptchaStage.ts
+++ b/web/src/flow/stages/captcha/CaptchaStage.ts
@@ -1,8 +1,8 @@
-import "@goauthentik/web/elements/EmptyState";
-import { PFSize } from "@goauthentik/web/elements/Spinner";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import { PFSize } from "@goauthentik/elements/Spinner";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/consent/ConsentStage.ts b/web/src/flow/stages/consent/ConsentStage.ts
similarity index 96%
rename from web/src/flows/stages/consent/ConsentStage.ts
rename to web/src/flow/stages/consent/ConsentStage.ts
index b9919e878..0e1a4c712 100644
--- a/web/src/flows/stages/consent/ConsentStage.ts
+++ b/web/src/flow/stages/consent/ConsentStage.ts
@@ -1,6 +1,6 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -8,7 +8,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/dummy/DummyStage.ts b/web/src/flow/stages/dummy/DummyStage.ts
similarity index 90%
rename from web/src/flows/stages/dummy/DummyStage.ts
rename to web/src/flow/stages/dummy/DummyStage.ts
index cbba575ff..f460576cf 100644
--- a/web/src/flows/stages/dummy/DummyStage.ts
+++ b/web/src/flow/stages/dummy/DummyStage.ts
@@ -1,13 +1,13 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/email/EmailStage.ts b/web/src/flow/stages/email/EmailStage.ts
similarity index 92%
rename from web/src/flows/stages/email/EmailStage.ts
rename to web/src/flow/stages/email/EmailStage.ts
index 80e688ef0..7326ac016 100644
--- a/web/src/flows/stages/email/EmailStage.ts
+++ b/web/src/flow/stages/email/EmailStage.ts
@@ -1,12 +1,12 @@
-import "@goauthentik/web/elements/EmptyState";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/EmptyState";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/identification/IdentificationStage.ts b/web/src/flow/stages/identification/IdentificationStage.ts
similarity index 97%
rename from web/src/flows/stages/identification/IdentificationStage.ts
rename to web/src/flow/stages/identification/IdentificationStage.ts
index 09e0ecca2..9b167b526 100644
--- a/web/src/flows/stages/identification/IdentificationStage.ts
+++ b/web/src/flow/stages/identification/IdentificationStage.ts
@@ -1,14 +1,14 @@
-import "@goauthentik/web/elements/Divider";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
+import "@goauthentik/elements/Divider";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
 import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
diff --git a/web/src/flows/stages/password/PasswordStage.ts b/web/src/flow/stages/password/PasswordStage.ts
similarity index 93%
rename from web/src/flows/stages/password/PasswordStage.ts
rename to web/src/flow/stages/password/PasswordStage.ts
index e0487fbda..e1c6855e8 100644
--- a/web/src/flows/stages/password/PasswordStage.ts
+++ b/web/src/flow/stages/password/PasswordStage.ts
@@ -1,8 +1,8 @@
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import "@goauthentik/web/flows/FormStatic";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
-import { PasswordManagerPrefill } from "@goauthentik/web/flows/stages/identification/IdentificationStage";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import "@goauthentik/flow/FormStatic";
+import { BaseStage } from "@goauthentik/flow/stages/base";
+import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
diff --git a/web/src/flows/stages/prompt/PromptStage.ts b/web/src/flow/stages/prompt/PromptStage.ts
similarity index 96%
rename from web/src/flows/stages/prompt/PromptStage.ts
rename to web/src/flow/stages/prompt/PromptStage.ts
index 6a7808e16..6fd674a83 100644
--- a/web/src/flows/stages/prompt/PromptStage.ts
+++ b/web/src/flow/stages/prompt/PromptStage.ts
@@ -1,8 +1,8 @@
-import "@goauthentik/web/elements/Divider";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/elements/forms/FormElement";
-import { BaseStage } from "@goauthentik/web/flows/stages/base";
-import { LOCALES } from "@goauthentik/web/interfaces/locale";
+import { LOCALES } from "@goauthentik/common/ui/locale";
+import "@goauthentik/elements/Divider";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/elements/forms/FormElement";
+import { BaseStage } from "@goauthentik/flow/stages/base";
 
 import { t } from "@lingui/macro";
 
@@ -10,7 +10,7 @@ import { CSSResult, TemplateResult, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
diff --git a/web/src/interfaces/FlowInterface.ts b/web/src/interfaces/FlowInterface.ts
deleted file mode 100644
index fcc1433c0..000000000
--- a/web/src/interfaces/FlowInterface.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/flows/FlowExecutor";
-import "@goauthentik/web/interfaces/locale";
diff --git a/web/poly.ts b/web/src/polyfill/poly.ts
similarity index 100%
rename from web/poly.ts
rename to web/src/polyfill/poly.ts
diff --git a/web/src/user/LibraryApplication.ts b/web/src/user/LibraryApplication.ts
index 4ff36aec8..4d3457cb1 100644
--- a/web/src/user/LibraryApplication.ts
+++ b/web/src/user/LibraryApplication.ts
@@ -1,15 +1,16 @@
-import { me } from "@goauthentik/web/api/Users";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { truncate } from "@goauthentik/web/utils";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { me } from "@goauthentik/common/users";
+import { truncate } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
@@ -18,7 +19,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { Application } from "@goauthentik/api";
 
 @customElement("ak-library-app")
-export class LibraryApplication extends LitElement {
+export class LibraryApplication extends AKElement {
     @property({ attribute: false })
     application?: Application;
 
diff --git a/web/src/user/LibraryPage.ts b/web/src/user/LibraryPage.ts
index 478e80826..4921fa6e7 100644
--- a/web/src/user/LibraryPage.ts
+++ b/web/src/user/LibraryPage.ts
@@ -1,18 +1,20 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { LayoutType, UIConfig, uiConfig } from "@goauthentik/web/common/config";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import "@goauthentik/web/user/LibraryApplication";
-import { groupBy, loading } from "@goauthentik/web/utils";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { LayoutType, UIConfig, uiConfig } from "@goauthentik/common/ui/config";
+import { groupBy } from "@goauthentik/common/utils";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import "@goauthentik/user/LibraryApplication";
 import Fuse from "fuse.js";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
@@ -23,10 +25,17 @@ import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css";
 
 import { Application, CoreApi } from "@goauthentik/api";
 
+export function loading<T>(v: T, actual: TemplateResult): TemplateResult {
+    if (!v) {
+        return html`<ak-empty-state ?loading="${true}" header=${t`Loading`}> </ak-empty-state>`;
+    }
+    return actual;
+}
+
 @customElement("ak-library")
-export class LibraryPage extends LitElement {
+export class LibraryPage extends AKElement {
     @property({ attribute: false })
-    apps?: AKResponse<Application>;
+    apps?: PaginatedResponse<Application>;
 
     @property({ attribute: false })
     selectedApp?: Application;
diff --git a/web/src/routesUser.ts b/web/src/user/Routes.ts
similarity index 69%
rename from web/src/routesUser.ts
rename to web/src/user/Routes.ts
index b67971d38..8908f4ecb 100644
--- a/web/src/routesUser.ts
+++ b/web/src/user/Routes.ts
@@ -1,5 +1,5 @@
-import { Route } from "@goauthentik/web/elements/router/Route";
-import "@goauthentik/web/user/LibraryPage";
+import { Route } from "@goauthentik/elements/router/Route";
+import "@goauthentik/user/LibraryPage";
 
 import { html } from "lit";
 
@@ -9,7 +9,7 @@ export const ROUTES: Route[] = [
     new Route(new RegExp("^#.*")).redirect("/library"),
     new Route(new RegExp("^/library$"), async () => html`<ak-library></ak-library>`),
     new Route(new RegExp("^/settings$"), async () => {
-        await import("@goauthentik/web/user/user-settings/UserSettingsPage");
+        await import("@goauthentik/user/user-settings/UserSettingsPage");
         return html`<ak-user-settings></ak-user-settings>`;
     }),
 ];
diff --git a/web/src/interfaces/UserInterface.ts b/web/src/user/UserInterface.ts
similarity index 92%
rename from web/src/interfaces/UserInterface.ts
rename to web/src/user/UserInterface.ts
index ec88c57be..fe787b70f 100644
--- a/web/src/interfaces/UserInterface.ts
+++ b/web/src/user/UserInterface.ts
@@ -1,32 +1,33 @@
-import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config";
-import { configureSentry } from "@goauthentik/web/api/Sentry";
-import { me } from "@goauthentik/web/api/Users";
-import { UserDisplay, uiConfig } from "@goauthentik/web/common/config";
-import { WebsocketClient } from "@goauthentik/web/common/ws";
+import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
 import {
     EVENT_API_DRAWER_TOGGLE,
     EVENT_NOTIFICATION_DRAWER_TOGGLE,
     EVENT_WS_MESSAGE,
-} from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/elements/messages/MessageContainer";
-import "@goauthentik/web/elements/notifications/NotificationDrawer";
-import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch";
-import "@goauthentik/web/elements/router/RouterOutlet";
-import "@goauthentik/web/elements/sidebar/Sidebar";
-import { DefaultTenant } from "@goauthentik/web/elements/sidebar/SidebarBrand";
-import "@goauthentik/web/elements/sidebar/SidebarItem";
-import "@goauthentik/web/interfaces/locale";
-import { ROUTES } from "@goauthentik/web/routesUser";
-import { first } from "@goauthentik/web/utils";
+} from "@goauthentik/common/constants";
+import { configureSentry } from "@goauthentik/common/sentry";
+import { UserDisplay, uiConfig } from "@goauthentik/common/ui/config";
+import { autoDetectLanguage } from "@goauthentik/common/ui/locale";
+import { me } from "@goauthentik/common/users";
+import { first } from "@goauthentik/common/utils";
+import { WebsocketClient } from "@goauthentik/common/ws";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/elements/messages/MessageContainer";
+import "@goauthentik/elements/notifications/NotificationDrawer";
+import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
+import "@goauthentik/elements/router/RouterOutlet";
+import "@goauthentik/elements/sidebar/Sidebar";
+import { DefaultTenant } from "@goauthentik/elements/sidebar/SidebarBrand";
+import "@goauthentik/elements/sidebar/SidebarItem";
+import { ROUTES } from "@goauthentik/user/Routes";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import PFBrand from "@patternfly/patternfly/components/Brand/brand.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
@@ -39,8 +40,10 @@ import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css";
 
 import { CurrentTenant, EventsApi } from "@goauthentik/api";
 
+autoDetectLanguage();
+
 @customElement("ak-interface-user")
-export class UserInterface extends LitElement {
+export class UserInterface extends AKElement {
     @property({ type: Boolean })
     notificationDrawerOpen = getURLParam("notificationDrawerOpen", false);
 
diff --git a/web/src/user/user-settings/BaseUserSettings.ts b/web/src/user/user-settings/BaseUserSettings.ts
index a3fd8c21b..703871cc0 100644
--- a/web/src/user/user-settings/BaseUserSettings.ts
+++ b/web/src/user/user-settings/BaseUserSettings.ts
@@ -1,13 +1,15 @@
-import { CSSResult, LitElement } from "lit";
+import { AKElement } from "@goauthentik/elements/Base";
+
+import { CSSResult } from "lit";
 import { property } from "lit/decorators.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-export abstract class BaseUserSettings extends LitElement {
+export abstract class BaseUserSettings extends AKElement {
     @property()
     objectId!: string;
 
diff --git a/web/src/user/user-settings/UserSettingsPage.ts b/web/src/user/user-settings/UserSettingsPage.ts
index 0042820da..1f14e623e 100644
--- a/web/src/user/user-settings/UserSettingsPage.ts
+++ b/web/src/user/user-settings/UserSettingsPage.ts
@@ -1,23 +1,24 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { me } from "@goauthentik/web/api/Users";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/Tabs";
-import "@goauthentik/web/elements/user/SessionList";
-import "@goauthentik/web/elements/user/UserConsentList";
-import "@goauthentik/web/user/user-settings/details/UserPassword";
-import "@goauthentik/web/user/user-settings/details/UserSettingsFlowExecutor";
-import "@goauthentik/web/user/user-settings/mfa/MFADevicesPage";
-import "@goauthentik/web/user/user-settings/sources/SourceSettings";
-import "@goauthentik/web/user/user-settings/tokens/UserTokenList";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/Tabs";
+import "@goauthentik/elements/user/SessionList";
+import "@goauthentik/elements/user/UserConsentList";
+import "@goauthentik/user/user-settings/details/UserPassword";
+import "@goauthentik/user/user-settings/details/UserSettingsFlowExecutor";
+import "@goauthentik/user/user-settings/mfa/MFADevicesPage";
+import "@goauthentik/user/user-settings/sources/SourceSettings";
+import "@goauthentik/user/user-settings/tokens/UserTokenList";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
@@ -34,7 +35,7 @@ import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import { StagesApi, UserSetting } from "@goauthentik/api";
 
 @customElement("ak-user-settings")
-export class UserSettingsPage extends LitElement {
+export class UserSettingsPage extends AKElement {
     static get styles(): CSSResult[] {
         return [
             PFBase,
diff --git a/web/src/user/user-settings/details/UserPassword.ts b/web/src/user/user-settings/details/UserPassword.ts
index e28cf52d3..a64d9023f 100644
--- a/web/src/user/user-settings/details/UserPassword.ts
+++ b/web/src/user/user-settings/details/UserPassword.ts
@@ -1,14 +1,15 @@
-import { AndNext } from "@goauthentik/web/api/Config";
+import { AndNext } from "@goauthentik/common/api/config";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { t } from "@lingui/macro";
 
 import { TemplateResult, html } from "lit";
-import { CSSResult, LitElement } from "lit";
+import { CSSResult } from "lit";
 import { customElement } from "lit/decorators.js";
 import { property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
@@ -16,7 +17,7 @@ import PFFormControl from "@patternfly/patternfly/components/FormControl/form-co
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-user-settings-password")
-export class UserSettingsPassword extends LitElement {
+export class UserSettingsPassword extends AKElement {
     @property()
     configureUrl?: string;
 
diff --git a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
index b58ce4cf2..26fc7747b 100644
--- a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
+++ b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
@@ -1,18 +1,19 @@
-import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config";
-import { refreshMe } from "@goauthentik/web/api/Users";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { StageHost } from "@goauthentik/web/flows/stages/base";
-import "@goauthentik/web/user/user-settings/details/stages/prompt/PromptStage";
+import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import { refreshMe } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { StageHost } from "@goauthentik/flow/stages/base";
+import "@goauthentik/user/user-settings/details/stages/prompt/PromptStage";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, html } from "lit";
+import { CSSResult, TemplateResult, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -31,7 +32,7 @@ import {
 } from "@goauthentik/api";
 
 @customElement("ak-user-settings-flow-executor")
-export class UserSettingsFlowExecutor extends LitElement implements StageHost {
+export class UserSettingsFlowExecutor extends AKElement implements StageHost {
     @property()
     flowSlug?: string;
 
@@ -161,7 +162,7 @@ export class UserSettingsFlowExecutor extends LitElement implements StageHost {
             );
             try {
                 document.querySelectorAll("ak-interface-user").forEach((int) => {
-                    (int as LitElement).requestUpdate();
+                    (int as AKElement).requestUpdate();
                 });
             } catch {
                 console.debug("authentik/user/flows: failed to find interface to refresh");
diff --git a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
index 9d035283b..b39fc0b04 100644
--- a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
+++ b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
@@ -1,5 +1,5 @@
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { PromptStage } from "@goauthentik/web/flows/stages/prompt/PromptStage";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { PromptStage } from "@goauthentik/flow/stages/prompt/PromptStage";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/user/user-settings/mfa/MFADeviceForm.ts b/web/src/user/user-settings/mfa/MFADeviceForm.ts
index 099a8a71d..c3dfdc6bc 100644
--- a/web/src/user/user-settings/mfa/MFADeviceForm.ts
+++ b/web/src/user/user-settings/mfa/MFADeviceForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/user/user-settings/mfa/MFADevicesPage.ts b/web/src/user/user-settings/mfa/MFADevicesPage.ts
index a9020c351..93c22f2d9 100644
--- a/web/src/user/user-settings/mfa/MFADevicesPage.ts
+++ b/web/src/user/user-settings/mfa/MFADevicesPage.ts
@@ -1,12 +1,12 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/buttons/Dropdown";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/TokenCopyButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import "@goauthentik/web/user/user-settings/mfa/MFADeviceForm";
+import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/buttons/Dropdown";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/TokenCopyButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
+import "@goauthentik/user/user-settings/mfa/MFADeviceForm";
 
 import { t } from "@lingui/macro";
 
@@ -52,7 +52,7 @@ export class MFADevicesPage extends Table<Device> {
     checkbox = true;
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async apiEndpoint(page: number): Promise<AKResponse<Device>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Device>> {
         const devices = await new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsAllList();
         return {
             pagination: {
diff --git a/web/src/user/user-settings/sources/SourceSettings.ts b/web/src/user/user-settings/sources/SourceSettings.ts
index 96fba65e3..93534b75f 100644
--- a/web/src/user/user-settings/sources/SourceSettings.ts
+++ b/web/src/user/user-settings/sources/SourceSettings.ts
@@ -1,24 +1,25 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/EmptyState";
-import "@goauthentik/web/user/user-settings/sources/SourceSettingsOAuth";
-import "@goauthentik/web/user/user-settings/sources/SourceSettingsPlex";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { AKElement } from "@goauthentik/elements/Base";
+import "@goauthentik/elements/EmptyState";
+import "@goauthentik/user/user-settings/sources/SourceSettingsOAuth";
+import "@goauthentik/user/user-settings/sources/SourceSettingsPlex";
 
 import { t } from "@lingui/macro";
 
-import { CSSResult, LitElement, TemplateResult, css, html } from "lit";
+import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { until } from "lit/directives/until.js";
 
-import AKGlobal from "@goauthentik/web/authentik.css";
+import AKGlobal from "@goauthentik/common/styles/authentik.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import PFDataList from "@patternfly/patternfly/components/DataList/data-list.css";
 
 import { PaginatedUserSourceConnectionList, SourcesApi, UserSetting } from "@goauthentik/api";
 
 @customElement("ak-user-settings-source")
-export class UserSourceSettingsPage extends LitElement {
+export class UserSourceSettingsPage extends AKElement {
     @property({ attribute: false })
     sourceSettings?: Promise<UserSetting[]>;
 
diff --git a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
index ec62acb28..9234689b6 100644
--- a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
+++ b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
@@ -1,9 +1,9 @@
-import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/Spinner";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { BaseUserSettings } from "@goauthentik/web/user/user-settings/BaseUserSettings";
+import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { MessageLevel } from "@goauthentik/common/messages";
+import "@goauthentik/elements/Spinner";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { BaseUserSettings } from "@goauthentik/user/user-settings/BaseUserSettings";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/user/user-settings/sources/SourceSettingsPlex.ts b/web/src/user/user-settings/sources/SourceSettingsPlex.ts
index 0b14112e9..ffeeea391 100644
--- a/web/src/user/user-settings/sources/SourceSettingsPlex.ts
+++ b/web/src/user/user-settings/sources/SourceSettingsPlex.ts
@@ -1,10 +1,10 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { PlexAPIClient, popupCenterScreen } from "@goauthentik/web/api/Plex";
-import { EVENT_REFRESH } from "@goauthentik/web/constants";
-import "@goauthentik/web/elements/Spinner";
-import { MessageLevel } from "@goauthentik/web/elements/messages/Message";
-import { showMessage } from "@goauthentik/web/elements/messages/MessageContainer";
-import { BaseUserSettings } from "@goauthentik/web/user/user-settings/BaseUserSettings";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { EVENT_REFRESH } from "@goauthentik/common/constants";
+import { PlexAPIClient, popupCenterScreen } from "@goauthentik/common/helpers/plex";
+import { MessageLevel } from "@goauthentik/common/messages";
+import "@goauthentik/elements/Spinner";
+import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
+import { BaseUserSettings } from "@goauthentik/user/user-settings/BaseUserSettings";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts
index cbbcefbfd..57fadf349 100644
--- a/web/src/user/user-settings/tokens/UserTokenForm.ts
+++ b/web/src/user/user-settings/tokens/UserTokenForm.ts
@@ -1,6 +1,6 @@
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import "@goauthentik/web/elements/forms/HorizontalFormElement";
-import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import "@goauthentik/elements/forms/HorizontalFormElement";
+import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 
 import { t } from "@lingui/macro";
 
diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts
index e371a04d8..fe9e52c11 100644
--- a/web/src/user/user-settings/tokens/UserTokenList.ts
+++ b/web/src/user/user-settings/tokens/UserTokenList.ts
@@ -1,15 +1,15 @@
-import { AKResponse } from "@goauthentik/web/api/Client";
-import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
-import { uiConfig } from "@goauthentik/web/common/config";
-import { PFColor } from "@goauthentik/web/elements/Label";
-import "@goauthentik/web/elements/buttons/Dropdown";
-import "@goauthentik/web/elements/buttons/ModalButton";
-import "@goauthentik/web/elements/buttons/TokenCopyButton";
-import "@goauthentik/web/elements/forms/DeleteBulkForm";
-import "@goauthentik/web/elements/forms/ModalForm";
-import { Table, TableColumn } from "@goauthentik/web/elements/table/Table";
-import { IntentToLabel } from "@goauthentik/web/pages/tokens/TokenListPage";
-import "@goauthentik/web/user/user-settings/tokens/UserTokenForm";
+import { IntentToLabel } from "@goauthentik/admin/tokens/TokenListPage";
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { uiConfig } from "@goauthentik/common/ui/config";
+import { PFColor } from "@goauthentik/elements/Label";
+import "@goauthentik/elements/buttons/Dropdown";
+import "@goauthentik/elements/buttons/ModalButton";
+import "@goauthentik/elements/buttons/TokenCopyButton";
+import "@goauthentik/elements/forms/DeleteBulkForm";
+import "@goauthentik/elements/forms/ModalForm";
+import { PaginatedResponse } from "@goauthentik/elements/table/Table";
+import { Table, TableColumn } from "@goauthentik/elements/table/Table";
+import "@goauthentik/user/user-settings/tokens/UserTokenForm";
 
 import { t } from "@lingui/macro";
 
@@ -32,7 +32,7 @@ export class UserTokenList extends Table<Token> {
     @property()
     order = "expires";
 
-    async apiEndpoint(page: number): Promise<AKResponse<Token>> {
+    async apiEndpoint(page: number): Promise<PaginatedResponse<Token>> {
         return new CoreApi(DEFAULT_CONFIG).coreTokensList({
             ordering: this.order,
             page: page,
diff --git a/web/tsconfig.json b/web/tsconfig.json
index bb000ccff..0f5b7dd0e 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -2,7 +2,13 @@
     "compilerOptions": {
         "strict": true,
         "paths": {
-            "@goauthentik/web/*": ["src/*"],
+            "@goauthentik/admin/*": ["src/admin/*"],
+            "@goauthentik/common/*": ["src/common/*"],
+            "@goauthentik/elements/*": ["src/elements/*"],
+            "@goauthentik/flow/*": ["src/flow/*"],
+            "@goauthentik/polyfill/*": ["src/polyfill/*"],
+            "@goauthentik/user/*": ["src/user/*"],
+            "@goauthentik/locales/*": ["src/locales/*"],
             "@goauthentik/docs/*": ["../website/docs/*"]
         },
         "baseUrl": ".",