diff --git a/cli/ts/commands/extractVkToFile.ts b/cli/ts/commands/extractVkToFile.ts
index 3d96d77ba2..54af523e53 100644
--- a/cli/ts/commands/extractVkToFile.ts
+++ b/cli/ts/commands/extractVkToFile.ts
@@ -2,7 +2,7 @@ import { extractVk } from "maci-circuits";
 
 import fs from "fs";
 
-import { ExtractVkToFileArgs } from "../utils";
+import { ExtractVkToFileArgs } from "../utils/interfaces";
 
 /**
  * Command to confirm that the verifying keys in the contract match the
diff --git a/cli/ts/commands/mergeMessages.ts b/cli/ts/commands/mergeMessages.ts
index 99eb393465..c446806894 100644
--- a/cli/ts/commands/mergeMessages.ts
+++ b/cli/ts/commands/mergeMessages.ts
@@ -4,19 +4,13 @@ import {
   AccQueue__factory as AccQueueFactory,
 } from "maci-contracts/typechain-types";
 
-import {
-  DEFAULT_SR_QUEUE_OPS,
-  banner,
-  contractExists,
-  currentBlockTimestamp,
-  info,
-  logError,
-  logGreen,
-  logYellow,
-  success,
-  readContractAddress,
-  type MergeMessagesArgs,
-} from "../utils";
+import type { MergeMessagesArgs } from "../utils/interfaces";
+
+import { banner } from "../utils/banner";
+import { contractExists, currentBlockTimestamp } from "../utils/contracts";
+import { DEFAULT_SR_QUEUE_OPS } from "../utils/defaults";
+import { readContractAddress } from "../utils/storage";
+import { info, logError, logGreen, logYellow, success } from "../utils/theme";
 
 /**
  * Merge the message queue on chain
diff --git a/cli/ts/commands/mergeSignups.ts b/cli/ts/commands/mergeSignups.ts
index cb91782862..c6b2070dab 100644
--- a/cli/ts/commands/mergeSignups.ts
+++ b/cli/ts/commands/mergeSignups.ts
@@ -1,17 +1,11 @@
 import { MACI__factory as MACIFactory, Poll__factory as PollFactory } from "maci-contracts/typechain-types";
 
-import {
-  banner,
-  contractExists,
-  currentBlockTimestamp,
-  info,
-  logError,
-  logGreen,
-  logYellow,
-  success,
-  readContractAddress,
-  type MergeSignupsArgs,
-} from "../utils";
+import type { MergeSignupsArgs } from "../utils/interfaces";
+
+import { banner } from "../utils/banner";
+import { contractExists, currentBlockTimestamp } from "../utils/contracts";
+import { readContractAddress } from "../utils/storage";
+import { info, logError, logGreen, logYellow, success } from "../utils/theme";
 
 /**
  * Command to merge the signups of a MACI contract