diff --git a/apps/mail-bridge/postal-db/functions.ts b/apps/mail-bridge/postal-db/functions.ts
index c5ddb7f7..2ce74bd4 100644
--- a/apps/mail-bridge/postal-db/functions.ts
+++ b/apps/mail-bridge/postal-db/functions.ts
@@ -16,7 +16,7 @@ import {
   getUniqueDKIMSelector,
   randomAlphaNumeric
 } from './generators';
-import { and, eq, sql } from 'drizzle-orm/sql';
+import { and, eq, sql } from 'drizzle-orm';
 import {
   lookupCNAME,
   lookupMX,
@@ -27,7 +27,7 @@ import {
   parseSpfIncludes,
   parseDmarc,
   buildDmarcRecord
-} from '@u22n/utils';
+} from '@u22n/utils/dns';
 import { env } from '../env';
 
 export type CreateOrgInput = {
diff --git a/apps/mail-bridge/postal-routes/inbound.ts b/apps/mail-bridge/postal-routes/inbound.ts
index b049b4fe..e8701cc8 100644
--- a/apps/mail-bridge/postal-routes/inbound.ts
+++ b/apps/mail-bridge/postal-routes/inbound.ts
@@ -19,7 +19,7 @@ import {
   typeIdValidator,
   validateTypeId,
   type TypeId
-} from '@u22n/utils';
+} from '@u22n/utils/typeid';
 import { Hono } from 'hono';
 import { z } from 'zod';
 import { db } from '@u22n/database';
diff --git a/apps/mail-bridge/trpc/routers/domainRouter.ts b/apps/mail-bridge/trpc/routers/domainRouter.ts
index 682e4355..481d4204 100644
--- a/apps/mail-bridge/trpc/routers/domainRouter.ts
+++ b/apps/mail-bridge/trpc/routers/domainRouter.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { router, protectedProcedure } from '../trpc';
 import { and, eq } from '@u22n/database/orm';
 import { postalServers } from '@u22n/database/schema';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { postalDB } from '../../postal-db';
 import { httpEndpoints, organizations, servers } from '../../postal-db/schema';
 import {
diff --git a/apps/mail-bridge/trpc/routers/orgRouter.ts b/apps/mail-bridge/trpc/routers/orgRouter.ts
index 6ff63fa6..b6b6fb45 100644
--- a/apps/mail-bridge/trpc/routers/orgRouter.ts
+++ b/apps/mail-bridge/trpc/routers/orgRouter.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { router, protectedProcedure } from '../trpc';
 import { eq } from '@u22n/database/orm';
-import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
 import {
   addMailServer,
   createOrg,
diff --git a/apps/mail-bridge/trpc/routers/sendMailRouter.ts b/apps/mail-bridge/trpc/routers/sendMailRouter.ts
index 986ffaf2..12f07bc1 100644
--- a/apps/mail-bridge/trpc/routers/sendMailRouter.ts
+++ b/apps/mail-bridge/trpc/routers/sendMailRouter.ts
@@ -15,7 +15,7 @@ import {
   orgs,
   convoParticipants
 } from '@u22n/database/schema';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { and, eq, inArray } from '@u22n/database/orm';
 import { tiptapHtml, tiptapVue3 } from '@u22n/tiptap';
 import { tipTapExtensions } from '@u22n/tiptap/extensions';
diff --git a/apps/mail-bridge/utils/contactParsing.ts b/apps/mail-bridge/utils/contactParsing.ts
index a8f5d19f..b38c4962 100644
--- a/apps/mail-bridge/utils/contactParsing.ts
+++ b/apps/mail-bridge/utils/contactParsing.ts
@@ -7,7 +7,7 @@ import {
   contacts,
   emailIdentities
 } from '@u22n/database/schema';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 
 export async function parseAddressIds(input: {
   addresses: EmailAddress[];
diff --git a/apps/mail-bridge/utils/realtime.ts b/apps/mail-bridge/utils/realtime.ts
index fb565429..7653ead6 100644
--- a/apps/mail-bridge/utils/realtime.ts
+++ b/apps/mail-bridge/utils/realtime.ts
@@ -2,8 +2,7 @@ import { db } from '@u22n/database';
 import { eq, inArray } from '@u22n/database/orm';
 import { convoEntries, convoParticipants, convos } from '@u22n/database/schema';
 import RealtimeServer from '@u22n/realtime/server';
-
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { env } from '../env';
 
 export const realtime = new RealtimeServer({
diff --git a/apps/platform/package.json b/apps/platform/package.json
index 79574360..0f0f98ec 100644
--- a/apps/platform/package.json
+++ b/apps/platform/package.json
@@ -29,7 +29,6 @@
     "@u22n/utils": "workspace:^",
     "@unkey/ratelimit": "^0.1.3",
     "hono": "^4.3.8",
-    "itty-time": "^1.0.6",
     "lucia": "^3.1.1",
     "oslo": "^1.1.3",
     "superjson": "^2.2.1",
diff --git a/apps/platform/storage.ts b/apps/platform/storage.ts
index 83c64a7f..16f6b66a 100644
--- a/apps/platform/storage.ts
+++ b/apps/platform/storage.ts
@@ -1,5 +1,5 @@
 import { env } from './env';
-import { ms } from 'itty-time';
+import { ms } from '@u22n/utils/ms';
 import redisDriver from 'unstorage/drivers/redis';
 import { createStorage, type StorageValue } from 'unstorage';
 import type { DatabaseSession } from 'lucia';
diff --git a/apps/platform/trpc/routers/authRouter/passkeyRouter.ts b/apps/platform/trpc/routers/authRouter/passkeyRouter.ts
index b2e63aee..65f7c937 100644
--- a/apps/platform/trpc/routers/authRouter/passkeyRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/passkeyRouter.ts
@@ -7,12 +7,9 @@ import type {
   RegistrationResponseJSON,
   AuthenticationResponseJSON
 } from '@simplewebauthn/types';
-import {
-  nanoIdToken,
-  typeIdGenerator,
-  typeIdValidator,
-  zodSchemas
-} from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
+import { ms } from '@u22n/utils/ms';
 import {
   verifyRegistrationResponse,
   generateRegistrationOptions,
@@ -23,7 +20,6 @@ import { createAuthenticator } from '~platform/utils/auth/passkeyUtils';
 import { validateUsername } from './signupRouter';
 import { createLuciaSessionCookie } from '~platform/utils/session';
 import { env } from '~platform/env';
-import { ms } from 'itty-time';
 import { getCookie, setCookie } from 'hono/cookie';
 
 export const passkeyRouter = router({
diff --git a/apps/platform/trpc/routers/authRouter/passwordRouter.ts b/apps/platform/trpc/routers/authRouter/passwordRouter.ts
index a5cf64a6..ae3010c0 100644
--- a/apps/platform/trpc/routers/authRouter/passwordRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/passwordRouter.ts
@@ -7,12 +7,9 @@ import {
 } from '~platform/trpc/trpc';
 import { eq } from '@u22n/database/orm';
 import { accounts } from '@u22n/database/schema';
-import {
-  nanoIdToken,
-  typeIdGenerator,
-  zodSchemas,
-  strongPasswordSchema
-} from '@u22n/utils';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
+import { strongPasswordSchema } from '@u22n/utils/password';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 import { lucia } from '~platform/utils/auth';
 import { validateUsername } from './signupRouter';
diff --git a/apps/platform/trpc/routers/authRouter/recoveryRouter.ts b/apps/platform/trpc/routers/authRouter/recoveryRouter.ts
index 4c9665be..f1e17dd6 100644
--- a/apps/platform/trpc/routers/authRouter/recoveryRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/recoveryRouter.ts
@@ -3,12 +3,10 @@ import { Argon2id } from 'oslo/password';
 import { router, publicRateLimitedProcedure } from '~platform/trpc/trpc';
 import { eq } from '@u22n/database/orm';
 import { accounts } from '@u22n/database/schema';
-import {
-  nanoIdToken,
-  strongPasswordSchema,
-  typeIdValidator,
-  zodSchemas
-} from '@u22n/utils';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
+import { strongPasswordSchema } from '@u22n/utils/password';
+import { typeIdValidator } from '@u22n/utils/typeid';
+import { ms } from '@u22n/utils/ms';
 import { TRPCError } from '@trpc/server';
 import { createLuciaSessionCookie } from '~platform/utils/session';
 import { decodeHex, encodeHex } from 'oslo/encoding';
@@ -16,7 +14,6 @@ import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
 import { deleteCookie, getCookie, setCookie } from 'hono/cookie';
 import { env } from '~platform/env';
 import { storage } from '~platform/storage';
-import { ms } from 'itty-time';
 
 export const recoveryRouter = router({
   /**
diff --git a/apps/platform/trpc/routers/authRouter/signupRouter.ts b/apps/platform/trpc/routers/authRouter/signupRouter.ts
index 04088c30..3f2d3108 100644
--- a/apps/platform/trpc/routers/authRouter/signupRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/signupRouter.ts
@@ -4,7 +4,8 @@ import type { DBType } from '@u22n/database';
 import { eq } from '@u22n/database/orm';
 import { accounts } from '@u22n/database/schema';
 import { blockedUsernames, reservedUsernames } from '~platform/utils/signup';
-import { zodSchemas, calculatePasswordStrength } from '@u22n/utils';
+import { calculatePasswordStrength } from '@u22n/utils/password';
+import { zodSchemas } from '@u22n/utils/zodSchemas';
 
 export async function validateUsername(
   db: DBType,
diff --git a/apps/platform/trpc/routers/authRouter/twoFactorRouter.ts b/apps/platform/trpc/routers/authRouter/twoFactorRouter.ts
index 69cae361..e942c142 100644
--- a/apps/platform/trpc/routers/authRouter/twoFactorRouter.ts
+++ b/apps/platform/trpc/routers/authRouter/twoFactorRouter.ts
@@ -9,7 +9,7 @@ import { accounts } from '@u22n/database/schema';
 import { decodeHex, encodeHex } from 'oslo/encoding';
 import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
 import { TRPCError } from '@trpc/server';
-import { nanoIdToken, zodSchemas } from '@u22n/utils';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
 import { Argon2id } from 'oslo/password';
 import { getCookie, setCookie } from 'hono/cookie';
 import { storage } from '~platform/storage';
diff --git a/apps/platform/trpc/routers/convoRouter/convoRouter.ts b/apps/platform/trpc/routers/convoRouter/convoRouter.ts
index 3df84c82..ae08642e 100644
--- a/apps/platform/trpc/routers/convoRouter/convoRouter.ts
+++ b/apps/platform/trpc/routers/convoRouter/convoRouter.ts
@@ -31,7 +31,11 @@ import {
   convoEntryPrivateVisibilityParticipants,
   convoEntryRawHtmlEmails
 } from '@u22n/database/schema';
-import { typeIdValidator, type TypeId, typeIdGenerator } from '@u22n/utils';
+import {
+  typeIdValidator,
+  type TypeId,
+  typeIdGenerator
+} from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 import { tipTapExtensions } from '@u22n/tiptap/extensions';
 import { tiptapCore, type tiptapVue3 } from '@u22n/tiptap';
diff --git a/apps/platform/trpc/routers/convoRouter/entryRouter.ts b/apps/platform/trpc/routers/convoRouter/entryRouter.ts
index 4a63537a..3300de9c 100644
--- a/apps/platform/trpc/routers/convoRouter/entryRouter.ts
+++ b/apps/platform/trpc/routers/convoRouter/entryRouter.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { router, orgProcedure } from '~platform/trpc/trpc';
 import { and, desc, eq, lt, or } from '@u22n/database/orm';
 import { convos, convoEntries } from '@u22n/database/schema';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 
 export const convoEntryRouter = router({
diff --git a/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts b/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
index 50a40d5e..567b25ca 100644
--- a/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts
@@ -6,11 +6,11 @@ import {
   postalServers,
   orgPostalConfigs
 } from '@u22n/database/schema';
-import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { lookupNS } from '@u22n/utils/dns';
 import { TRPCError } from '@trpc/server';
 import { isAccountAdminOfOrg } from '~platform/utils/account';
 import { mailBridgeTrpcClient } from '~platform/utils/tRPCServerClients';
-import { lookupNS } from '@u22n/utils';
 
 export const domainsRouter = router({
   createNewDomain: orgProcedure
diff --git a/apps/platform/trpc/routers/orgRouter/mail/emailIdentityExternalRouter.ts b/apps/platform/trpc/routers/orgRouter/mail/emailIdentityExternalRouter.ts
index a570a6a6..53fdea8b 100644
--- a/apps/platform/trpc/routers/orgRouter/mail/emailIdentityExternalRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/mail/emailIdentityExternalRouter.ts
@@ -11,7 +11,8 @@ import {
   emailIdentitiesAuthorizedOrgMembers,
   emailIdentityExternal
 } from '@u22n/database/schema';
-import { nanoIdToken, typeIdGenerator, typeIdValidator } from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { nanoIdToken } from '@u22n/utils/zodSchemas';
 import { TRPCError } from '@trpc/server';
 import { env } from '~platform/env';
 
diff --git a/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts b/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts
index de3b5cc7..6ef11961 100644
--- a/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts
@@ -20,9 +20,9 @@ import {
 import {
   typeIdGenerator,
   typeIdValidator,
-  type TypeId,
-  nanoIdToken
-} from '@u22n/utils';
+  type TypeId
+} from '@u22n/utils/typeid';
+import { nanoIdToken } from '@u22n/utils/zodSchemas';
 import { isAccountAdminOfOrg } from '~platform/utils/account';
 import { TRPCError } from '@trpc/server';
 import { emailIdentityExternalRouter } from './emailIdentityExternalRouter';
diff --git a/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts b/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
index 70abb66f..1fc5e3f8 100644
--- a/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts
@@ -8,7 +8,7 @@ import {
   orgMemberProfiles,
   accounts
 } from '@u22n/database/schema';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 import { blockedUsernames, reservedUsernames } from '~platform/utils/signup';
 
diff --git a/apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts b/apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts
index 8e9870c5..282c1326 100644
--- a/apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { router, orgProcedure } from '~platform/trpc/trpc';
 import { eq } from '@u22n/database/orm';
 import { orgs } from '@u22n/database/schema';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { isAccountAdminOfOrg } from '~platform/utils/account';
 import { TRPCError } from '@trpc/server';
 
diff --git a/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts b/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
index 67382d57..07408bc7 100644
--- a/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
@@ -17,12 +17,8 @@ import {
   orgMemberProfiles,
   accounts
 } from '@u22n/database/schema';
-import {
-  nanoIdToken,
-  typeIdGenerator,
-  typeIdValidator,
-  zodSchemas
-} from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
 import { refreshOrgShortCodeCache } from '~platform/utils/orgShortCode';
 import { isAccountAdminOfOrg } from '~platform/utils/account';
 import { TRPCError } from '@trpc/server';
diff --git a/apps/platform/trpc/routers/orgRouter/users/teamsHandler.ts b/apps/platform/trpc/routers/orgRouter/users/teamsHandler.ts
index dc1e491b..e677f7bb 100644
--- a/apps/platform/trpc/routers/orgRouter/users/teamsHandler.ts
+++ b/apps/platform/trpc/routers/orgRouter/users/teamsHandler.ts
@@ -8,7 +8,7 @@ import {
   teams,
   orgMembers
 } from '@u22n/database/schema';
-import { typeIdGenerator, type TypeId } from '@u22n/utils';
+import { typeIdGenerator, type TypeId } from '@u22n/utils/typeid';
 
 export async function addOrgMemberToTeamHandler({
   orgId,
diff --git a/apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts b/apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts
index 3aec0400..0af744fb 100644
--- a/apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts
+++ b/apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts
@@ -2,8 +2,8 @@ import { z } from 'zod';
 import { router, orgProcedure } from '~platform/trpc/trpc';
 import { eq, and } from '@u22n/database/orm';
 import { teams } from '@u22n/database/schema';
-import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
-import { uiColors } from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { uiColors } from '@u22n/utils/colors';
 import { isAccountAdminOfOrg } from '../../../../utils/account';
 import { TRPCError } from '@trpc/server';
 import { addOrgMemberToTeamHandler } from './teamsHandler';
diff --git a/apps/platform/trpc/routers/userRouter/addressRouter.ts b/apps/platform/trpc/routers/userRouter/addressRouter.ts
index aeff0691..e89e379c 100644
--- a/apps/platform/trpc/routers/userRouter/addressRouter.ts
+++ b/apps/platform/trpc/routers/userRouter/addressRouter.ts
@@ -11,7 +11,8 @@ import {
   emailRoutingRulesDestinations
 } from '@u22n/database/schema';
 import { orgMembers } from '@u22n/database/schema';
-import { nanoIdToken, typeIdGenerator, typeIdValidator } from '@u22n/utils';
+import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
+import { nanoIdToken } from '@u22n/utils/zodSchemas';
 import { env } from '~platform/env';
 
 export const addressRouter = router({
diff --git a/apps/platform/trpc/routers/userRouter/profileRouter.ts b/apps/platform/trpc/routers/userRouter/profileRouter.ts
index f36a6181..e090624e 100644
--- a/apps/platform/trpc/routers/userRouter/profileRouter.ts
+++ b/apps/platform/trpc/routers/userRouter/profileRouter.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { router, accountProcedure } from '~platform/trpc/trpc';
 import { and, eq } from '@u22n/database/orm';
 import { orgMemberProfiles, orgs, orgMembers } from '@u22n/database/schema';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { TRPCError } from '@trpc/server';
 
 export const profileRouter = router({
diff --git a/apps/platform/trpc/routers/userRouter/securityRouter.ts b/apps/platform/trpc/routers/userRouter/securityRouter.ts
index a91a8351..9ef94d39 100644
--- a/apps/platform/trpc/routers/userRouter/securityRouter.ts
+++ b/apps/platform/trpc/routers/userRouter/securityRouter.ts
@@ -8,13 +8,13 @@ import { z } from 'zod';
 import { router, accountProcedure } from '~platform/trpc/trpc';
 import { and, eq } from '@u22n/database/orm';
 import { accounts, authenticators, sessions } from '@u22n/database/schema';
+import { typeIdValidator } from '@u22n/utils/typeid';
+import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
 import {
-  nanoIdToken,
-  typeIdValidator,
-  zodSchemas,
-  calculatePasswordStrength,
-  strongPasswordSchema
-} from '@u22n/utils';
+  strongPasswordSchema,
+  calculatePasswordStrength
+} from '@u22n/utils/password';
+import { datePlus } from '@u22n/utils/ms';
 import { TRPCError } from '@trpc/server';
 import { deleteCookie, getCookie, setCookie } from 'hono/cookie';
 import type {
@@ -28,7 +28,6 @@ import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
 import { lucia } from '~platform/utils/auth';
 import { storage } from '~platform/storage';
 import { env } from '~platform/env';
-import { datePlus } from 'itty-time';
 
 const authStorage = storage.auth;
 
diff --git a/apps/platform/utils/auth.ts b/apps/platform/utils/auth.ts
index 84e3de89..a780fcea 100644
--- a/apps/platform/utils/auth.ts
+++ b/apps/platform/utils/auth.ts
@@ -5,7 +5,7 @@ import {
   TimeSpan
 } from 'lucia';
 import { UnInboxDBAdapter } from './auth/adapter';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { env } from '~platform/env';
 
 const adapter = new UnInboxDBAdapter();
diff --git a/apps/platform/utils/auth/adapter.ts b/apps/platform/utils/auth/adapter.ts
index 0ec3670f..7cc61155 100644
--- a/apps/platform/utils/auth/adapter.ts
+++ b/apps/platform/utils/auth/adapter.ts
@@ -3,7 +3,7 @@ import { db } from '@u22n/database';
 import { eq, inArray, lte } from '@u22n/database/orm';
 import { sessions, accounts } from '@u22n/database/schema';
 import { storage } from '~platform/storage';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 
 const sessionStorage = storage.session;
 
diff --git a/apps/platform/utils/auth/passkeyUtils.ts b/apps/platform/utils/auth/passkeyUtils.ts
index d075afe6..4d1a1a53 100644
--- a/apps/platform/utils/auth/passkeyUtils.ts
+++ b/apps/platform/utils/auth/passkeyUtils.ts
@@ -3,7 +3,7 @@ import { db } from '@u22n/database';
 import { accounts, authenticators } from '@u22n/database/schema';
 import type { AuthenticatorTransportFuture } from '@simplewebauthn/types';
 import { isoBase64URL } from '@simplewebauthn/server/helpers';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 
 export type CredentialDeviceType = 'singleDevice' | 'multiDevice';
 export interface Authenticator {
diff --git a/apps/platform/utils/realtime.ts b/apps/platform/utils/realtime.ts
index 36926c98..010be404 100644
--- a/apps/platform/utils/realtime.ts
+++ b/apps/platform/utils/realtime.ts
@@ -2,7 +2,7 @@ import { db } from '@u22n/database';
 import { eq, inArray } from '@u22n/database/orm';
 import { convoEntries, convoParticipants, convos } from '@u22n/database/schema';
 import RealtimeServer from '@u22n/realtime/server';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { env } from '~platform/env';
 
 export const realtime = new RealtimeServer({
diff --git a/apps/platform/utils/session.ts b/apps/platform/utils/session.ts
index a9f9ac96..c7302dd9 100644
--- a/apps/platform/utils/session.ts
+++ b/apps/platform/utils/session.ts
@@ -1,6 +1,6 @@
 import { UAParser } from 'ua-parser-js';
 import { lucia } from './auth';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import type { Context } from 'hono';
 import { setCookie } from 'hono/cookie';
 import { db } from '@u22n/database';
diff --git a/apps/storage/api/avatar.ts b/apps/storage/api/avatar.ts
index a9bf0ccb..5c0ec686 100644
--- a/apps/storage/api/avatar.ts
+++ b/apps/storage/api/avatar.ts
@@ -3,7 +3,7 @@ import type { Ctx } from '../ctx';
 import { checkSignedIn } from '../middlewares';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { typeIdValidator, type TypeId } from '@u22n/utils';
+import { typeIdValidator, type TypeId } from '@u22n/utils/typeid';
 import {
   orgMemberProfiles,
   orgMembers,
diff --git a/apps/storage/api/internalPresign.ts b/apps/storage/api/internalPresign.ts
index 244df8a6..3d53203f 100644
--- a/apps/storage/api/internalPresign.ts
+++ b/apps/storage/api/internalPresign.ts
@@ -2,7 +2,7 @@ import { Hono } from 'hono';
 import type { Ctx } from '../ctx';
 import { checkAuthorizedService } from '../middlewares';
 import { zValidator } from '@hono/zod-validator';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { env } from '../env';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
diff --git a/apps/storage/api/presign.ts b/apps/storage/api/presign.ts
index 06563384..f6c83552 100644
--- a/apps/storage/api/presign.ts
+++ b/apps/storage/api/presign.ts
@@ -7,7 +7,7 @@ import { orgMembers, orgs, pendingAttachments } from '@u22n/database/schema';
 import { and, eq } from '@u22n/database/orm';
 import { db } from '@u22n/database';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
-import { typeIdGenerator } from '@u22n/utils';
+import { typeIdGenerator } from '@u22n/utils/typeid';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { env } from '../env';
 import { s3Client } from '../s3';
diff --git a/apps/storage/proxy/attachment.ts b/apps/storage/proxy/attachment.ts
index 67d09a82..3bae7f7e 100644
--- a/apps/storage/proxy/attachment.ts
+++ b/apps/storage/proxy/attachment.ts
@@ -4,7 +4,7 @@ import { env } from '../env';
 import { s3Client } from '../s3';
 import { db } from '@u22n/database';
 import { and, eq } from '@u22n/database/orm';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { zValidator } from '@hono/zod-validator';
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index f905468d..f9365d68 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -3,7 +3,7 @@
   import { ref, useNuxtApp, watch } from '#imports';
   import { type ConvoEntryMetadata } from '@u22n/database/schema';
   import { useConvoEntryStore } from '~/stores/convoEntryStore';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
 
   const { $trpc } = useNuxtApp();
 
diff --git a/apps/web-app/components/settings/addNewEmail.vue b/apps/web-app/components/settings/addNewEmail.vue
index 2e084a56..25f9475e 100644
--- a/apps/web-app/components/settings/addNewEmail.vue
+++ b/apps/web-app/components/settings/addNewEmail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import type { UiColor } from '@u22n/utils';
+  import type { UiColor } from '@u22n/utils/colors';
   import { z } from 'zod';
   import {
     computed,
@@ -10,7 +10,7 @@
     watch,
     watchDebounced
   } from '#imports';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
   import { useEEStore } from '~/stores/eeStore';
   import { useRoute } from '#vue-router';
 
diff --git a/apps/web-app/components/settings/addNewEmailExternal.vue b/apps/web-app/components/settings/addNewEmailExternal.vue
index edb399a1..59ca384f 100644
--- a/apps/web-app/components/settings/addNewEmailExternal.vue
+++ b/apps/web-app/components/settings/addNewEmailExternal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import type { UiColor } from '@u22n/utils';
+  import type { UiColor } from '@u22n/utils/colors';
   import { z } from 'zod';
   import {
     computed,
@@ -10,7 +10,7 @@
     watch,
     watchDebounced
   } from '#imports';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
   import { useEEStore } from '~/stores/eeStore';
   import { useRoute } from '#vue-router';
 
diff --git a/apps/web-app/components/settings/addNewInvite.vue b/apps/web-app/components/settings/addNewInvite.vue
index d49655e7..4068aa0c 100644
--- a/apps/web-app/components/settings/addNewInvite.vue
+++ b/apps/web-app/components/settings/addNewInvite.vue
@@ -8,7 +8,8 @@
     watchDebounced
   } from '#imports';
   import { useRoute } from '#vue-router';
-  import type { TypeId, UiColor } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
+  import type { UiColor } from '@u22n/utils/typeid/colors';
   import { z } from 'zod';
 
   const { $trpc } = useNuxtApp();
diff --git a/apps/web-app/components/settings/addNewTeam.vue b/apps/web-app/components/settings/addNewTeam.vue
index 36ca6e8d..819993df 100644
--- a/apps/web-app/components/settings/addNewTeam.vue
+++ b/apps/web-app/components/settings/addNewTeam.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import type { UiColor } from '@u22n/utils';
+  import type { UiColor } from '@u22n/utils/colors';
   import { z } from 'zod';
   import {
     computed,
diff --git a/apps/web-app/components/un/ui-avatar.vue b/apps/web-app/components/un/ui-avatar.vue
index 67669299..95a3d5ad 100644
--- a/apps/web-app/components/un/ui-avatar.vue
+++ b/apps/web-app/components/un/ui-avatar.vue
@@ -2,8 +2,8 @@
   import { computed } from '#imports';
   import { useUtils } from '~/composables/utils';
   import { NuxtUiAvatar } from '#components';
-  import { uiColors } from '@u22n/utils';
-  import type { TypeId } from '@u22n/utils';
+  import { uiColors } from '@u22n/utils/colors';
+  import type { TypeId } from '@u22n/utils/typeid';
 
   type UiColors = (typeof uiColors)[number] | null;
 
diff --git a/apps/web-app/composables/types.ts b/apps/web-app/composables/types.ts
index 2695daf1..e7dce9ce 100644
--- a/apps/web-app/composables/types.ts
+++ b/apps/web-app/composables/types.ts
@@ -1,5 +1,6 @@
 import { useNuxtApp } from '#imports';
-import type { TypeId, UiColor } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
+import type { UiColor } from '@u22n/utils/colors';
 
 const { $trpc } = useNuxtApp();
 
diff --git a/apps/web-app/composables/utils.ts b/apps/web-app/composables/utils.ts
index 5dd76255..0cfdd31d 100644
--- a/apps/web-app/composables/utils.ts
+++ b/apps/web-app/composables/utils.ts
@@ -2,7 +2,7 @@ import type { ConvoParticipantEntry } from './types';
 import { cva, type VariantProps } from 'class-variance-authority';
 import type { UserConvosDataType } from '~/composables/types';
 import { useRuntimeConfig } from '#imports';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 
 function generateAvatarUrl({
   publicId,
diff --git a/apps/web-app/pages/[orgShortCode]/convo/[convoId].vue b/apps/web-app/pages/[orgShortCode]/convo/[convoId].vue
index 060e06d0..17ab4ffa 100644
--- a/apps/web-app/pages/[orgShortCode]/convo/[convoId].vue
+++ b/apps/web-app/pages/[orgShortCode]/convo/[convoId].vue
@@ -19,7 +19,7 @@
   import { tiptapVue3, emptyTiptapEditorContent } from '@u22n/tiptap';
   import { type ConvoEntryMetadata } from '@u22n/database/schema';
   import { stringify } from 'superjson';
-  import { validateTypeId, type TypeId } from '@u22n/utils';
+  import { validateTypeId, type TypeId } from '@u22n/utils/typeid';
   import type { UnEditor } from '#components';
 
   const { $trpc } = useNuxtApp();
diff --git a/apps/web-app/pages/[orgShortCode]/convo/new.vue b/apps/web-app/pages/[orgShortCode]/convo/new.vue
index e6c9e7f6..2f4dea60 100644
--- a/apps/web-app/pages/[orgShortCode]/convo/new.vue
+++ b/apps/web-app/pages/[orgShortCode]/convo/new.vue
@@ -14,7 +14,7 @@
   import type { UiColor } from '@u22n/types/ui';
   import { stringify } from 'superjson';
   import { z } from 'zod';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
 
   const { $trpc } = useNuxtApp();
   const orgShortCode = (useRoute().params.orgShortCode ?? '') as string;
diff --git a/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/[teamId].vue b/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/[teamId].vue
index daf303f7..40a1a2d8 100644
--- a/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/[teamId].vue
+++ b/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/[teamId].vue
@@ -7,7 +7,8 @@
     useToast,
     watch
   } from '#imports';
-  import type { TypeId, UiColor } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
+  import type { UiColor } from '@u22n/utils/colors';
   const orgShortCode = (useRoute().params.orgShortCode ?? '') as string;
 
   const { $trpc } = useNuxtApp();
diff --git a/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/index.vue b/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/index.vue
index c41c8cb8..da6d093f 100644
--- a/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/index.vue
+++ b/apps/web-app/pages/[orgShortCode]/settings/org/users/teams/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { navigateTo, ref, useNuxtApp, useRoute, watch } from '#imports';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
   import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';
 
   const breakpoints = useBreakpoints(breakpointsTailwind);
diff --git a/apps/web-app/pages/[orgShortCode]/settings/user/security.vue b/apps/web-app/pages/[orgShortCode]/settings/user/security.vue
index 5c95d1c5..a317a8aa 100644
--- a/apps/web-app/pages/[orgShortCode]/settings/user/security.vue
+++ b/apps/web-app/pages/[orgShortCode]/settings/user/security.vue
@@ -21,7 +21,7 @@
     RegistrationResponseJSON
   } from '@simplewebauthn/types';
   import type { SettingsSecurityPasswordReset } from '#build/components';
-  import type { TypeId } from '@u22n/utils';
+  import type { TypeId } from '@u22n/utils/typeid';
   import { navigateTo } from '#app';
   import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';
 
diff --git a/apps/web-app/pages/index.vue b/apps/web-app/pages/index.vue
index 85cb82bd..b17cf5c6 100644
--- a/apps/web-app/pages/index.vue
+++ b/apps/web-app/pages/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { startAuthentication } from '@simplewebauthn/browser';
   import { z } from 'zod';
-  import { zodSchemas } from '@u22n/utils';
+  import { zodSchemas } from '@u22n/utils/zodSchemas';
   import {
     navigateTo,
     definePageMeta,
diff --git a/apps/web-app/pages/join/index.vue b/apps/web-app/pages/join/index.vue
index 774246ad..9023ede1 100644
--- a/apps/web-app/pages/join/index.vue
+++ b/apps/web-app/pages/join/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import { zodSchemas } from '@u22n/utils';
+  import { zodSchemas } from '@u22n/utils/zodSchemas';
   import {
     navigateTo,
     definePageMeta,
diff --git a/apps/web-app/pages/recovery.vue b/apps/web-app/pages/recovery.vue
index 4dbed014..bfce8260 100644
--- a/apps/web-app/pages/recovery.vue
+++ b/apps/web-app/pages/recovery.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { z } from 'zod';
-  import { zodSchemas } from '@u22n/utils';
+  import { zodSchemas } from '@u22n/utils/zodSchemas';
   import {
     navigateTo,
     definePageMeta,
diff --git a/apps/web-app/stores/convoEntryStore.ts b/apps/web-app/stores/convoEntryStore.ts
index ca7c65f5..1634814c 100644
--- a/apps/web-app/stores/convoEntryStore.ts
+++ b/apps/web-app/stores/convoEntryStore.ts
@@ -1,6 +1,6 @@
 import { ref } from 'vue';
 import { defineStore, acceptHMRUpdate, useNuxtApp } from '#imports';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { useRoute } from '#vue-router';
 
 export const useConvoEntryStore = defineStore(
diff --git a/apps/web-app/stores/convoHiddenStore.ts b/apps/web-app/stores/convoHiddenStore.ts
index fb578df3..81446a3b 100644
--- a/apps/web-app/stores/convoHiddenStore.ts
+++ b/apps/web-app/stores/convoHiddenStore.ts
@@ -1,6 +1,6 @@
 import { ref, computed } from 'vue';
 import { defineStore, acceptHMRUpdate, useNuxtApp } from '#imports';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { useRoute } from '#vue-router';
 
 export const useHiddenConvoStore = defineStore(
diff --git a/apps/web-app/stores/convoStore.ts b/apps/web-app/stores/convoStore.ts
index 9a35b36d..12b20ba9 100644
--- a/apps/web-app/stores/convoStore.ts
+++ b/apps/web-app/stores/convoStore.ts
@@ -1,6 +1,6 @@
 import { ref, computed } from 'vue';
 import { defineStore, acceptHMRUpdate, useNuxtApp } from '#imports';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import { useRoute } from '#vue-router';
 
 export const useConvoStore = defineStore(
diff --git a/apps/web/package.json b/apps/web/package.json
index 1a14b20b..a0698d48 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -35,7 +35,6 @@
     "cmdk": "^1.0.0",
     "date-fns": "^3.6.0",
     "input-otp": "^1.2.4",
-    "itty-time": "^1.0.6",
     "jotai": "^2.8.0",
     "next": "14.2.3",
     "next-client-cookies": "^1.1.1",
diff --git a/apps/web/src/app/(login)/_components/password-login.tsx b/apps/web/src/app/(login)/_components/password-login.tsx
index 6c09b38f..a6c2dbe2 100644
--- a/apps/web/src/app/(login)/_components/password-login.tsx
+++ b/apps/web/src/app/(login)/_components/password-login.tsx
@@ -19,7 +19,7 @@ import {
 import { Key, User } from '@phosphor-icons/react';
 import { useRef, useState } from 'react';
 import { toast } from 'sonner';
-import { zodSchemas } from '@u22n/utils';
+import { zodSchemas } from '@u22n/utils/zodSchemas';
 import TogglePasswordBox from '@/src/components/toggle-password';
 
 export default function PasswordLoginButton() {
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx
index 2b5b56dd..991d5969 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/context-panel.tsx
@@ -6,7 +6,7 @@ import { CaretUp, CaretDown } from '@phosphor-icons/react';
 import { useState } from 'react';
 import { type formatParticipantData } from '../../utils';
 import { memo } from 'react';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { Badge } from '@/src/components/shadcn-ui/badge';
 
 export function ContextPanel({
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx
index 3bf287a4..9ccc2085 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/messages-panel.tsx
@@ -9,7 +9,7 @@ import {
   Badge,
   Spinner
 } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { type JSONContent, generateHTML } from '@u22n/tiptap/react';
@@ -22,10 +22,8 @@ import { useAtom } from 'jotai';
 import { useCopyToClipboard } from '@uidotdev/usehooks';
 import { toast } from 'sonner';
 import { Virtuoso } from 'react-virtuoso';
-
 import { replyToMessageAtom } from '../atoms';
-
-import { ms } from 'itty-time';
+import { ms } from '@u22n/utils/ms';
 
 export function MessagesPanel({
   convoId,
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx
index d91ff5c0..f638dcd7 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/reply-box.tsx
@@ -2,7 +2,7 @@
 
 import { api } from '@/src/lib/trpc';
 import { Select } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { type JSONContent } from '@u22n/tiptap/react';
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx
index 3c90448c..81a2ac41 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/_components/top-bar.tsx
@@ -8,7 +8,7 @@ import useAwaitableModal, {
   type ModalComponent
 } from '@/src/hooks/use-awaitable-modal';
 import { type RouterOutputs, api } from '@/src/lib/trpc';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { useRouter } from 'next/navigation';
 import { Button } from '@/src/components/shadcn-ui/button';
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts b/apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts
index 61d2d09f..cb93d032 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/atoms.ts
@@ -1,4 +1,4 @@
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { atom } from 'jotai';
 
-export const replyToMessageAtom = atom<null | TypeId<'convoEntries'>>(null);
+export const replyToMessageAtom = atom<TypeId<'convoEntries'> | null>(null);
diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
index e79e126c..1ec21042 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
@@ -2,7 +2,7 @@
 
 import { api } from '@/src/lib/trpc';
 import Link from 'next/link';
-import { type TypeId, validateTypeId } from '@u22n/utils';
+import { type TypeId, validateTypeId } from '@u22n/utils/typeid';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { useMemo } from 'react';
 import { formatParticipantData } from '../utils';
diff --git a/apps/web/src/app/[orgShortCode]/convo/new/page.tsx b/apps/web/src/app/[orgShortCode]/convo/new/page.tsx
index 46115f3c..90812290 100644
--- a/apps/web/src/app/[orgShortCode]/convo/new/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/new/page.tsx
@@ -13,7 +13,7 @@ import {
   Text,
   TextField
 } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import {
   Command,
   CommandInput,
diff --git a/apps/web/src/app/[orgShortCode]/convo/utils.ts b/apps/web/src/app/[orgShortCode]/convo/utils.ts
index d12f65c3..432a28db 100644
--- a/apps/web/src/app/[orgShortCode]/convo/utils.ts
+++ b/apps/web/src/app/[orgShortCode]/convo/utils.ts
@@ -1,6 +1,6 @@
 import { api, type RouterOutputs } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 
 export function formatParticipantData(
   participant: RouterOutputs['convos']['getOrgMemberConvos']['data'][number]['participants'][number]
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx b/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx
index 9d8f0a92..df9dc5c1 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/addresses/_components/columns.tsx
@@ -2,7 +2,7 @@
 
 import { createColumnHelper, type ColumnDef } from '@tanstack/react-table';
 import { ScrollArea, Text, Flex } from '@radix-ui/themes';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import CopyButton from '@/src/components/copy-button';
 
 type Identity = {
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx b/apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx
index 98ad22d7..c488688b 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/security/_components/delete-modals.tsx
@@ -1,6 +1,6 @@
 import { type ModalComponent } from '@/src/hooks/use-awaitable-modal';
 import { Button, Dialog } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { api } from '@/src/lib/trpc';
 
 export function DeletePasskeyModal({
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx b/apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx
index bd5d9b84..a0f1691a 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/security/_components/reset-modals.tsx
@@ -23,7 +23,7 @@ import {
   InputOTPSeparator,
   InputOTPSlot
 } from '@/src/components/shadcn-ui/input-otp';
-import { ms } from 'itty-time';
+import { ms } from '@u22n/utils/ms';
 import Image from 'next/image';
 import { downloadAsFile } from '@/src/lib/utils';
 import { toast } from 'sonner';
diff --git a/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx b/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
index 7f4341ba..74309368 100644
--- a/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
+++ b/apps/web/src/app/join/invite/[code]/_components/invite-card.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { datePlus } from 'itty-time';
+import { datePlus } from '@u22n/utils/ms';
 import { Avatar, Button, Card, Flex, Spinner, Text } from '@radix-ui/themes';
 import Link from 'next/link';
 import { api, isAuthenticated } from '@/src/lib/trpc';
diff --git a/apps/web/src/app/join/page.tsx b/apps/web/src/app/join/page.tsx
index c0c8d85f..a1d7c174 100644
--- a/apps/web/src/app/join/page.tsx
+++ b/apps/web/src/app/join/page.tsx
@@ -15,7 +15,7 @@ import { useDebounce } from '@uidotdev/usehooks';
 import { api } from '@/src/lib/trpc';
 import { useState, useEffect } from 'react';
 import { toast } from 'sonner';
-import { zodSchemas } from '@u22n/utils';
+import { zodSchemas } from '@u22n/utils/zodSchemas';
 import { useCookies } from 'next-client-cookies';
 import { useRouter } from 'next/navigation';
 import Link from 'next/link';
diff --git a/apps/web/src/app/recovery/_components/modals.tsx b/apps/web/src/app/recovery/_components/modals.tsx
index 84a0c241..71d4e970 100644
--- a/apps/web/src/app/recovery/_components/modals.tsx
+++ b/apps/web/src/app/recovery/_components/modals.tsx
@@ -18,7 +18,7 @@ import TogglePasswordBox from '@/src/components/toggle-password';
 import { useDebounce } from '@uidotdev/usehooks';
 import { api } from '@/src/lib/trpc';
 import { cn } from '@/src/lib/utils';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 
 export function PasswordRecoveryModal({
   open,
diff --git a/apps/web/src/app/recovery/page.tsx b/apps/web/src/app/recovery/page.tsx
index 0184adee..9124edd0 100644
--- a/apps/web/src/app/recovery/page.tsx
+++ b/apps/web/src/app/recovery/page.tsx
@@ -8,7 +8,7 @@ import {
 } from '@/src/components/shadcn-ui/input-otp';
 import { type FieldApi, useForm } from '@tanstack/react-form';
 import { zodValidator } from '@tanstack/zod-form-adapter';
-import { zodSchemas } from '@u22n/utils';
+import { zodSchemas } from '@u22n/utils/zodSchemas';
 import { api } from '@/src/lib/trpc';
 import { z } from 'zod';
 import useAwaitableModal from '@/src/hooks/use-awaitable-modal';
diff --git a/apps/web/src/components/avatar-plus.tsx b/apps/web/src/components/avatar-plus.tsx
index 69f70b01..47bdeef1 100644
--- a/apps/web/src/components/avatar-plus.tsx
+++ b/apps/web/src/components/avatar-plus.tsx
@@ -8,7 +8,7 @@ import {
   Tooltip,
   type AvatarProps
 } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 
 type AvatarPlusProps = {
   size: AvatarProps['size'];
diff --git a/apps/web/src/components/shared/attachment-button.tsx b/apps/web/src/components/shared/attachment-button.tsx
index a66e05f3..b41b7eed 100644
--- a/apps/web/src/components/shared/attachment-button.tsx
+++ b/apps/web/src/components/shared/attachment-button.tsx
@@ -1,7 +1,7 @@
 import uploadTracker from '@/src/lib/upload';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { Badge, Button, Flex, IconButton } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { type PrimitiveAtom, useAtom } from 'jotai';
 import { Plus } from '@phosphor-icons/react';
 import { env } from 'next-runtime-env';
diff --git a/apps/web/src/components/shared/avatar-modal.tsx b/apps/web/src/components/shared/avatar-modal.tsx
index fbba71da..c609c938 100644
--- a/apps/web/src/components/shared/avatar-modal.tsx
+++ b/apps/web/src/components/shared/avatar-modal.tsx
@@ -11,7 +11,7 @@ import {
   Flex,
   Progress
 } from '@radix-ui/themes';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { Camera } from '@phosphor-icons/react';
 import { useRef, useState } from 'react';
 
diff --git a/apps/web/src/hooks/use-time-ago.ts b/apps/web/src/hooks/use-time-ago.ts
index b16727db..7d6b0377 100644
--- a/apps/web/src/hooks/use-time-ago.ts
+++ b/apps/web/src/hooks/use-time-ago.ts
@@ -1,5 +1,5 @@
 import { intlFormatDistance } from 'date-fns';
-import { ms } from 'itty-time';
+import { ms } from '@u22n/utils/ms';
 import { useState, useEffect } from 'react';
 
 export default function useTimeAgo(
diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
index 44547a84..c2140730 100644
--- a/apps/web/src/lib/utils.ts
+++ b/apps/web/src/lib/utils.ts
@@ -1,6 +1,7 @@
 import { twMerge } from 'tailwind-merge';
 import clsx, { type ClassValue } from 'clsx';
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
+import { env } from 'next-runtime-env';
 
 export const cn = (...input: ClassValue[]) => twMerge(clsx(input));
 
@@ -17,6 +18,7 @@ export const downloadAsFile = (filename: string, content: string) => {
   document.body.removeChild(element);
 };
 
+const STORAGE_URL = env('NEXT_PUBLIC_STORAGE_URL');
 export const generateAvatarUrl = ({
   publicId,
   avatarTimestamp,
@@ -41,7 +43,7 @@ export const generateAvatarUrl = ({
     return null;
   }
   const epochTs = new Date(avatarTimestamp).getTime() / 1000;
-  return `${process.env.NEXT_PUBLIC_STORAGE_URL}/avatar/${publicId}/${
+  return `${STORAGE_URL}/avatar/${publicId}/${
     size ? size : '5xl'
   }?t=${epochTs}`;
 };
diff --git a/apps/web/src/stores/global-store.ts b/apps/web/src/stores/global-store.ts
index 7bf5d767..ecb4982b 100644
--- a/apps/web/src/stores/global-store.ts
+++ b/apps/web/src/stores/global-store.ts
@@ -1,4 +1,4 @@
-import { type TypeId } from '@u22n/utils';
+import { type TypeId } from '@u22n/utils/typeid';
 import { createStore } from 'zustand/vanilla';
 
 type Org = {
diff --git a/ee/apps/command/server/trpc/routers/orgRoutes.ts b/ee/apps/command/server/trpc/routers/orgRoutes.ts
index 4ab2d456..156764e3 100644
--- a/ee/apps/command/server/trpc/routers/orgRoutes.ts
+++ b/ee/apps/command/server/trpc/routers/orgRoutes.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { router, accountProcedure } from '../trpc';
 import { eq } from '@u22n/database/orm';
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { db } from '@u22n/database';
 import { orgs, type OrgMetadata } from '@u22n/database/schema';
 import { TRPCError } from '@trpc/server';
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index b706756b..31235881 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -19,7 +19,8 @@ import {
   customType
 } from 'drizzle-orm/mysql-core';
 import { relations } from 'drizzle-orm';
-import { typeIdDataType as publicId, uiColors } from '@u22n/utils';
+import { typeIdDataType as publicId } from '@u22n/utils/typeid';
+import { uiColors } from '@u22n/utils/colors';
 
 // TODO: we need to make this separated from nuxt apps, imports from "#import" breaks everything
 
diff --git a/packages/realtime/events.ts b/packages/realtime/events.ts
index c5fade2c..348de340 100644
--- a/packages/realtime/events.ts
+++ b/packages/realtime/events.ts
@@ -1,4 +1,4 @@
-import { typeIdValidator } from '@u22n/utils';
+import { typeIdValidator } from '@u22n/utils/typeid';
 import { z } from 'zod';
 
 // Just a few examples, do the real implementation here
diff --git a/packages/realtime/server.ts b/packages/realtime/server.ts
index 51ccdb91..2e11ac2c 100644
--- a/packages/realtime/server.ts
+++ b/packages/realtime/server.ts
@@ -1,6 +1,6 @@
 import Pusher from 'pusher';
 import { type EventDataMap, eventDataMaps } from './events';
-import type { TypeId } from '@u22n/utils';
+import type { TypeId } from '@u22n/utils/typeid';
 import type { z } from 'zod';
 
 export default class RealtimeServer {
diff --git a/packages/utils/dns/index.ts b/packages/utils/dns/index.ts
index 2c940a91..18d11b75 100644
--- a/packages/utils/dns/index.ts
+++ b/packages/utils/dns/index.ts
@@ -62,3 +62,5 @@ export const lookupNS = async (domain: string) =>
   mapOverSuccess(await lookup(domain, 'NS'), (data) =>
     data.map((d) => d.data.replace(/\.$/, ''))
   );
+
+export * from './txtParsers';
diff --git a/packages/utils/ms.ts b/packages/utils/ms.ts
new file mode 100644
index 00000000..76c067ad
--- /dev/null
+++ b/packages/utils/ms.ts
@@ -0,0 +1 @@
+export * from 'itty-time';
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 53d57ca1..c16e5612 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -7,7 +7,12 @@
     "check": "tsc --noEmit"
   },
   "exports": {
-    ".": "./index.ts"
+    "./password": "./password.ts",
+    "./ms": "./ms.ts",
+    "./dns": "./dns/index.ts",
+    "./typeid": "./typeid.ts",
+    "./colors": "./uiColors.ts",
+    "./zodSchemas": "./zodSchemas.ts"
   },
   "keywords": [],
   "author": "",
@@ -22,6 +27,7 @@
     "@zxcvbn-ts/matcher-pwned": "^3.0.4",
     "drizzle-orm": "^0.30.3",
     "human-format": "^1.2.0",
+    "itty-time": "^1.0.6",
     "nanoid": "^5.0.6",
     "typeid-js": "^0.5.0",
     "zod": "^3.23.8"
diff --git a/packages/utils/password/index.ts b/packages/utils/password.ts
similarity index 100%
rename from packages/utils/password/index.ts
rename to packages/utils/password.ts
diff --git a/packages/utils/typeId/index.ts b/packages/utils/typeid.ts
similarity index 100%
rename from packages/utils/typeId/index.ts
rename to packages/utils/typeid.ts
diff --git a/packages/utils/uiColors.ts b/packages/utils/uiColors.ts
new file mode 100644
index 00000000..6576747d
--- /dev/null
+++ b/packages/utils/uiColors.ts
@@ -0,0 +1,21 @@
+export const uiColors = [
+  'red',
+  'orange',
+  'amber',
+  'yellow',
+  'lime',
+  'green',
+  'emerald',
+  'teal',
+  'cyan',
+  'sky',
+  'blue',
+  'indigo',
+  'violet',
+  'purple',
+  'fuchsia',
+  'pink',
+  'rose'
+] as const;
+
+export type UiColor = (typeof uiColors)[number];
diff --git a/packages/utils/index.ts b/packages/utils/zodSchemas.ts
similarity index 77%
rename from packages/utils/index.ts
rename to packages/utils/zodSchemas.ts
index 75b313ab..de1dd77b 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/zodSchemas.ts
@@ -46,30 +46,3 @@ export const zodSchemas = {
         message: 'Only letters and numbers'
       })
 };
-
-export * from './typeId';
-export * from './dns';
-export * from './dns/txtParsers';
-export * from './password';
-
-export const uiColors = [
-  'red',
-  'orange',
-  'amber',
-  'yellow',
-  'lime',
-  'green',
-  'emerald',
-  'teal',
-  'cyan',
-  'sky',
-  'blue',
-  'indigo',
-  'violet',
-  'purple',
-  'fuchsia',
-  'pink',
-  'rose'
-] as const;
-
-export type UiColor = (typeof uiColors)[number];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 61d363e8..dbfae58d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -174,9 +174,6 @@ importers:
       hono:
         specifier: ^4.3.8
         version: 4.3.8
-      itty-time:
-        specifier: ^1.0.6
-        version: 1.0.6
       lucia:
         specifier: ^3.1.1
         version: 3.1.1
@@ -338,9 +335,6 @@ importers:
       input-otp:
         specifier: ^1.2.4
         version: 1.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      itty-time:
-        specifier: ^1.0.6
-        version: 1.0.6
       jotai:
         specifier: ^2.8.0
         version: 2.8.0(@types/react@18.3.1)(react@18.3.1)
@@ -837,6 +831,9 @@ importers:
       human-format:
         specifier: ^1.2.0
         version: 1.2.0
+      itty-time:
+        specifier: ^1.0.6
+        version: 1.0.6
       nanoid:
         specifier: ^5.0.6
         version: 5.0.6