diff --git a/src/commands/mail/address/create.tsx b/src/commands/mail/address/create.tsx
index 69210a76..ff2d52ad 100644
--- a/src/commands/mail/address/create.tsx
+++ b/src/commands/mail/address/create.tsx
@@ -12,7 +12,7 @@ import { ReactNode } from "react";
 import { ProcessRenderer } from "../../../rendering/process/process.js";
 import { FlagInput, OutputFlags } from "@oclif/core/lib/interfaces/parser.js";
 import ByteQuantity from "../../../lib/units/ByteQuantity.js";
-import { generateRandomPassword } from "../commons.js";
+import { generateRandomPassword } from "../../../lib/resources/mail/commons.js";
 
 type CreateResult = {
   addressId: string;
diff --git a/src/commands/mail/address/update.tsx b/src/commands/mail/address/update.tsx
index 3b7dc837..f8f45aa5 100644
--- a/src/commands/mail/address/update.tsx
+++ b/src/commands/mail/address/update.tsx
@@ -13,7 +13,7 @@ import {
   mailAddressArgs,
   withMailAddressId,
 } from "../../../lib/resources/mail/flags.js";
-import { generateRandomPassword } from "../commons.js";
+import { generateRandomPassword } from "../../../lib/resources/mail/commons.js";
 
 type UpdateResult = {
   generatedPassword: string | null;
diff --git a/src/commands/mail/deliverybox/create.tsx b/src/commands/mail/deliverybox/create.tsx
index 967c0a96..4dacbd63 100644
--- a/src/commands/mail/deliverybox/create.tsx
+++ b/src/commands/mail/deliverybox/create.tsx
@@ -11,7 +11,7 @@ import { Success } from "../../../rendering/react/components/Success.js";
 import { ReactNode } from "react";
 import { ProcessRenderer } from "../../../rendering/process/process.js";
 import { FlagInput, OutputFlags } from "@oclif/core/lib/interfaces/parser.js";
-import { generateRandomPassword } from "../commons.js";
+import { generateRandomPassword } from "../../../lib/resources/mail/commons.js";
 
 type CreateResult = {
   deliveryBoxId: string;
diff --git a/src/commands/mail/deliverybox/update.tsx b/src/commands/mail/deliverybox/update.tsx
index d1fc1c2b..77da7b19 100644
--- a/src/commands/mail/deliverybox/update.tsx
+++ b/src/commands/mail/deliverybox/update.tsx
@@ -13,7 +13,7 @@ import {
   mailDeliveryBoxArgs,
   withDeliveryBoxId,
 } from "../../../lib/resources/mail/flags.js";
-import { generateRandomPassword } from "../commons.js";
+import { generateRandomPassword } from "../../../lib/resources/mail/commons.js";
 
 type UpdateResult = {
   generatedPassword: string | null;
diff --git a/src/commands/mail/commons.tsx b/src/lib/resources/mail/commons.tsx
similarity index 64%
rename from src/commands/mail/commons.tsx
rename to src/lib/resources/mail/commons.tsx
index 75ee8912..cc902d04 100644
--- a/src/commands/mail/commons.tsx
+++ b/src/lib/resources/mail/commons.tsx
@@ -1,6 +1,6 @@
-import { generatePassword } from "../../lib/util/password/generatePassword.js";
-import { Value } from "../../rendering/react/components/Value.js";
-import { ProcessRenderer } from "../../rendering/process/process.js";
+import { generatePassword } from "../../util/password/generatePassword.js";
+import { Value } from "../../../rendering/react/components/Value.js";
+import { ProcessRenderer } from "../../../rendering/process/process.js";
 import { Text } from "ink";
 
 export async function generateRandomPassword(