diff --git a/api/session.ts b/api/session.ts
index 1704368..0c1f647 100644
--- a/api/session.ts
+++ b/api/session.ts
@@ -1,4 +1,4 @@
-import { identity } from "@modules/identity/client.ts";
+import { identity } from "@modules/iam/client.ts";
 import { getPrincipalSession } from "@modules/identity/server.ts";
 import { context, UnauthorizedError } from "@platform/relay";
 import { storage } from "@platform/storage";
diff --git a/deno.json b/deno.json
index eb62fe0..dda9811 100644
--- a/deno.json
+++ b/deno.json
@@ -4,7 +4,7 @@
   "workspace": [
     "api",
     "apps/react",
-    "modules/identity",
+    "modules/iam",
     "modules/workspace",
     "platform/config",
     "platform/database",
@@ -17,8 +17,9 @@
     "platform/vault"
   ],
   "imports": {
-    "@modules/identity/client.ts": "./modules/identity/client.ts",
-    "@modules/identity/server.ts": "./modules/identity/server.ts",
+    "@modules/iam/client.ts": "./modules/iam/client.ts",
+    "@modules/iam/server.ts": "./modules/iam/server.ts",
+    "@modules/iam/types.ts": "./modules/iam/types.ts",
     "@modules/workspace/client.ts": "./modules/workspace/client.ts",
     "@modules/workspace/server.ts": "./modules/workspace/server.ts",
     "@platform/config/": "./platform/config/",
diff --git a/deno.lock b/deno.lock
index f9a14fa..4be9626 100644
--- a/deno.lock
+++ b/deno.lock
@@ -2370,7 +2370,7 @@
           ]
         }
       },
-      "modules/identity": {
+      "modules/iam": {
         "packageJson": {
           "dependencies": [
             "npm:@cerbos/core@0.24.1",
diff --git a/modules/identity/cerbos/client.ts b/modules/iam/cerbos/client.ts
similarity index 100%
rename from modules/identity/cerbos/client.ts
rename to modules/iam/cerbos/client.ts
diff --git a/modules/identity/cerbos/policies/identity.yaml b/modules/iam/cerbos/policies/identity.yaml
similarity index 100%
rename from modules/identity/cerbos/policies/identity.yaml
rename to modules/iam/cerbos/policies/identity.yaml
diff --git a/modules/identity/cerbos/policies/role.yaml b/modules/iam/cerbos/policies/role.yaml
similarity index 100%
rename from modules/identity/cerbos/policies/role.yaml
rename to modules/iam/cerbos/policies/role.yaml
diff --git a/modules/identity/cerbos/resources.ts b/modules/iam/cerbos/resources.ts
similarity index 100%
rename from modules/identity/cerbos/resources.ts
rename to modules/iam/cerbos/resources.ts
diff --git a/modules/identity/client.ts b/modules/iam/client.ts
similarity index 100%
rename from modules/identity/client.ts
rename to modules/iam/client.ts
diff --git a/modules/identity/config.ts b/modules/iam/config.ts
similarity index 100%
rename from modules/identity/config.ts
rename to modules/iam/config.ts
diff --git a/modules/identity/models/principal.ts b/modules/iam/models/principal.ts
similarity index 100%
rename from modules/identity/models/principal.ts
rename to modules/iam/models/principal.ts
diff --git a/modules/identity/models/session.ts b/modules/iam/models/session.ts
similarity index 100%
rename from modules/identity/models/session.ts
rename to modules/iam/models/session.ts
diff --git a/modules/identity/package.json b/modules/iam/package.json
similarity index 88%
rename from modules/identity/package.json
rename to modules/iam/package.json
index 8ed1511..a6565ed 100644
--- a/modules/identity/package.json
+++ b/modules/iam/package.json
@@ -5,7 +5,8 @@
   "type": "module",
   "exports": {
     "./client.ts": "./client.ts",
-    "./server.ts": "./server.ts"
+    "./server.ts": "./server.ts",
+    "./types.ts": "./types.ts"
   },
   "dependencies": {
     "@cerbos/core": "0.24.1",
diff --git a/modules/identity/routes/access/check-resource/handle.ts b/modules/iam/routes/access/check-resource/handle.ts
similarity index 100%
rename from modules/identity/routes/access/check-resource/handle.ts
rename to modules/iam/routes/access/check-resource/handle.ts
diff --git a/modules/identity/routes/access/check-resource/spec.ts b/modules/iam/routes/access/check-resource/spec.ts
similarity index 100%
rename from modules/identity/routes/access/check-resource/spec.ts
rename to modules/iam/routes/access/check-resource/spec.ts
diff --git a/modules/identity/routes/access/check-resources/handle.ts b/modules/iam/routes/access/check-resources/handle.ts
similarity index 100%
rename from modules/identity/routes/access/check-resources/handle.ts
rename to modules/iam/routes/access/check-resources/handle.ts
diff --git a/modules/identity/routes/access/check-resources/spec.ts b/modules/iam/routes/access/check-resources/spec.ts
similarity index 100%
rename from modules/identity/routes/access/check-resources/spec.ts
rename to modules/iam/routes/access/check-resources/spec.ts
diff --git a/modules/identity/routes/access/is-allowed/handle.ts b/modules/iam/routes/access/is-allowed/handle.ts
similarity index 100%
rename from modules/identity/routes/access/is-allowed/handle.ts
rename to modules/iam/routes/access/is-allowed/handle.ts
diff --git a/modules/identity/routes/access/is-allowed/spec.ts b/modules/iam/routes/access/is-allowed/spec.ts
similarity index 100%
rename from modules/identity/routes/access/is-allowed/spec.ts
rename to modules/iam/routes/access/is-allowed/spec.ts
diff --git a/modules/identity/routes/identities/get/handle.ts b/modules/iam/routes/identities/get/handle.ts
similarity index 100%
rename from modules/identity/routes/identities/get/handle.ts
rename to modules/iam/routes/identities/get/handle.ts
diff --git a/modules/identity/routes/identities/get/spec.ts b/modules/iam/routes/identities/get/spec.ts
similarity index 100%
rename from modules/identity/routes/identities/get/spec.ts
rename to modules/iam/routes/identities/get/spec.ts
diff --git a/modules/identity/routes/identities/update/handle.ts b/modules/iam/routes/identities/update/handle.ts
similarity index 100%
rename from modules/identity/routes/identities/update/handle.ts
rename to modules/iam/routes/identities/update/handle.ts
diff --git a/modules/identity/routes/identities/update/spec.ts b/modules/iam/routes/identities/update/spec.ts
similarity index 100%
rename from modules/identity/routes/identities/update/spec.ts
rename to modules/iam/routes/identities/update/spec.ts
diff --git a/modules/identity/routes/login/code/handle.ts b/modules/iam/routes/login/code/handle.ts
similarity index 100%
rename from modules/identity/routes/login/code/handle.ts
rename to modules/iam/routes/login/code/handle.ts
diff --git a/modules/identity/routes/login/code/spec.ts b/modules/iam/routes/login/code/spec.ts
similarity index 100%
rename from modules/identity/routes/login/code/spec.ts
rename to modules/iam/routes/login/code/spec.ts
diff --git a/modules/identity/routes/login/email/handle.ts b/modules/iam/routes/login/email/handle.ts
similarity index 100%
rename from modules/identity/routes/login/email/handle.ts
rename to modules/iam/routes/login/email/handle.ts
diff --git a/modules/identity/routes/login/email/spec.ts b/modules/iam/routes/login/email/spec.ts
similarity index 100%
rename from modules/identity/routes/login/email/spec.ts
rename to modules/iam/routes/login/email/spec.ts
diff --git a/modules/identity/routes/login/password/handle.ts b/modules/iam/routes/login/password/handle.ts
similarity index 100%
rename from modules/identity/routes/login/password/handle.ts
rename to modules/iam/routes/login/password/handle.ts
diff --git a/modules/identity/routes/login/password/spec.ts b/modules/iam/routes/login/password/spec.ts
similarity index 100%
rename from modules/identity/routes/login/password/spec.ts
rename to modules/iam/routes/login/password/spec.ts
diff --git a/modules/identity/routes/login/sudo/handle.ts b/modules/iam/routes/login/sudo/handle.ts
similarity index 100%
rename from modules/identity/routes/login/sudo/handle.ts
rename to modules/iam/routes/login/sudo/handle.ts
diff --git a/modules/identity/routes/login/sudo/spec.ts b/modules/iam/routes/login/sudo/spec.ts
similarity index 100%
rename from modules/identity/routes/login/sudo/spec.ts
rename to modules/iam/routes/login/sudo/spec.ts
diff --git a/modules/identity/routes/me/handle.ts b/modules/iam/routes/me/handle.ts
similarity index 100%
rename from modules/identity/routes/me/handle.ts
rename to modules/iam/routes/me/handle.ts
diff --git a/modules/identity/routes/me/spec.ts b/modules/iam/routes/me/spec.ts
similarity index 100%
rename from modules/identity/routes/me/spec.ts
rename to modules/iam/routes/me/spec.ts
diff --git a/modules/identity/routes/roles/handle.ts b/modules/iam/routes/roles/handle.ts
similarity index 100%
rename from modules/identity/routes/roles/handle.ts
rename to modules/iam/routes/roles/handle.ts
diff --git a/modules/identity/routes/roles/spec.ts b/modules/iam/routes/roles/spec.ts
similarity index 100%
rename from modules/identity/routes/roles/spec.ts
rename to modules/iam/routes/roles/spec.ts
diff --git a/modules/identity/routes/session/resolve/handle.ts b/modules/iam/routes/session/resolve/handle.ts
similarity index 100%
rename from modules/identity/routes/session/resolve/handle.ts
rename to modules/iam/routes/session/resolve/handle.ts
diff --git a/modules/identity/routes/session/resolve/spec.ts b/modules/iam/routes/session/resolve/spec.ts
similarity index 100%
rename from modules/identity/routes/session/resolve/spec.ts
rename to modules/iam/routes/session/resolve/spec.ts
diff --git a/modules/identity/server.ts b/modules/iam/server.ts
similarity index 100%
rename from modules/identity/server.ts
rename to modules/iam/server.ts
diff --git a/modules/identity/services/auth.ts b/modules/iam/services/auth.ts
similarity index 100%
rename from modules/identity/services/auth.ts
rename to modules/iam/services/auth.ts
diff --git a/modules/identity/services/database.ts b/modules/iam/services/database.ts
similarity index 100%
rename from modules/identity/services/database.ts
rename to modules/iam/services/database.ts
diff --git a/modules/identity/services/logger.ts b/modules/iam/services/logger.ts
similarity index 100%
rename from modules/identity/services/logger.ts
rename to modules/iam/services/logger.ts
diff --git a/modules/identity/services/session.ts b/modules/iam/services/session.ts
similarity index 100%
rename from modules/identity/services/session.ts
rename to modules/iam/services/session.ts
diff --git a/modules/identity/types.ts b/modules/iam/types.ts
similarity index 100%
rename from modules/identity/types.ts
rename to modules/iam/types.ts
diff --git a/modules/workspace/package.json b/modules/workspace/package.json
index 0820873..8f2c315 100644
--- a/modules/workspace/package.json
+++ b/modules/workspace/package.json
@@ -9,6 +9,7 @@
   },
   "types": "types.d.ts",
   "dependencies": {
+    "@modules/iam": "workspace:*",
     "@platform/database": "workspace:*",
     "@platform/relay": "workspace:*",
     "@platform/spec": "workspace:*",
diff --git a/modules/workspace/server.ts b/modules/workspace/server.ts
index 9e986f8..7da962c 100644
--- a/modules/workspace/server.ts
+++ b/modules/workspace/server.ts
@@ -1,6 +1,7 @@
 import { idIndex } from "@platform/database/id.ts";
 import { register as registerReadStore } from "@platform/database/registrar.ts";
 import { register as registerEventStore } from "@valkyr/event-store/mongo";
+import "@modules/iam/types.ts";
 
 import { db } from "./database.ts";
 import { eventStore } from "./event-store.ts";
diff --git a/platform/relay/libraries/context.ts b/platform/relay/libraries/context.ts
index 25d3414..2fe5065 100644
--- a/platform/relay/libraries/context.ts
+++ b/platform/relay/libraries/context.ts
@@ -1,4 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export type ServerContext = {};
+export interface ServerContext {
+  id: string;
+}
 
 export const context: ServerContext = {} as any;
diff --git a/platform/storage/storage.ts b/platform/storage/storage.ts
index 96ba1b2..cf4843f 100644
--- a/platform/storage/storage.ts
+++ b/platform/storage/storage.ts
@@ -17,5 +17,6 @@ export function getStorageContext(): StorageContext {
   return store;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export type StorageContext = {};
+export interface StorageContext {
+  id: string;
+}