diff --git a/src/cli/env.loader.ts b/src/cli/env.loader.ts
index f4ce71f7..cc1e910c 100644
--- a/src/cli/env.loader.ts
+++ b/src/cli/env.loader.ts
@@ -1,6 +1,6 @@
 import {notEmptyString} from '@dfinity/utils';
 import {nextArg} from '@junobuild/cli-tools';
-import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli.env';
+import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli/cli.env';
 
 export const loadEnv = (): JunoCliEnv => {
   const [_, ...args] = process.argv.slice(2);
diff --git a/src/configs/cli.config.ts b/src/configs/cli.config.ts
index 4c94d585..2b3ca0de 100644
--- a/src/configs/cli.config.ts
+++ b/src/configs/cli.config.ts
@@ -4,7 +4,7 @@ import type Conf from 'conf';
 import {red, yellow} from 'kleur';
 import {askForPassword} from '../services/cli.settings.services';
 import {getSettingsStore} from '../stores/settings.store';
-import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli.config';
+import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli/cli.config';
 import {loadConfig} from '../utils/cli.config.utils';
 
 // Save in https://github.com/sindresorhus/env-paths#pathsconfig
diff --git a/src/configs/cli.settings.config.ts b/src/configs/cli.settings.config.ts
index 1f2027d4..c4dac949 100644
--- a/src/configs/cli.settings.config.ts
+++ b/src/configs/cli.settings.config.ts
@@ -1,6 +1,6 @@
 import Conf, {type Schema} from 'conf';
 import {ENV} from '../env';
-import {type CliSettings} from '../types/cli.settings';
+import {type CliSettings} from '../types/cli/cli.settings';
 
 const schema: Schema<CliSettings> = {
   encryption: {
diff --git a/src/configs/cli.state.config.ts b/src/configs/cli.state.config.ts
index 60492edb..bec9ec63 100644
--- a/src/configs/cli.state.config.ts
+++ b/src/configs/cli.state.config.ts
@@ -5,7 +5,7 @@ import {
   type CliState,
   type CliStateSatellite,
   type CliStateSatelliteAppliedConfigHashes
-} from '../types/cli.state';
+} from '../types/cli/cli.state';
 
 export const getStateConfig = (): Conf<CliState> =>
   new Conf<CliState>({projectName: ENV.config.projectStateName});
diff --git a/src/constants/config.constants.ts b/src/constants/config.constants.ts
index 3316a876..479e50fb 100644
--- a/src/constants/config.constants.ts
+++ b/src/constants/config.constants.ts
@@ -1,7 +1,7 @@
 import type {Schema} from 'conf';
 import {ENV} from '../env';
-import {type CliConfig} from '../types/cli.config';
-import {type CliDefaultOptions, type CliOptions} from '../types/cli.options';
+import {type CliConfig} from '../types/cli/cli.config';
+import {type CliDefaultOptions, type CliOptions} from '../types/cli/cli.options';
 
 const schema: Schema<CliConfig> = {
   token: {
diff --git a/src/services/config/apply.services.ts b/src/services/config/apply.services.ts
index 10b31047..754ed8f2 100644
--- a/src/services/config/apply.services.ts
+++ b/src/services/config/apply.services.ts
@@ -42,7 +42,7 @@ import {
   type ConfigHash,
   type RuleHash,
   type SettingsHash
-} from '../../types/cli.state';
+} from '../../types/cli/cli.state';
 import type {SatelliteParametersWithId} from '../../types/satellite';
 import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
 import {objHash} from '../../utils/obj.utils';
diff --git a/src/services/config/init.services.ts b/src/services/config/init.services.ts
index 347ac772..6becc0cc 100644
--- a/src/services/config/init.services.ts
+++ b/src/services/config/init.services.ts
@@ -14,7 +14,7 @@ import {
   writeJunoConfig,
   writeJunoConfigPlaceholder
 } from '../../configs/juno.config';
-import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli.config';
+import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli/cli.config';
 import {type EmulatorConfigWithoutConsole} from '../../types/emulator';
 import type {PackageManager} from '../../types/pm';
 import {detectPackageManager} from '../../utils/pm.utils';
diff --git a/src/stores/settings.store.ts b/src/stores/settings.store.ts
index d2820457..b222ce06 100644
--- a/src/stores/settings.store.ts
+++ b/src/stores/settings.store.ts
@@ -3,7 +3,7 @@ import type Conf from 'conf';
 import {yellow} from 'kleur';
 import {getSettingsConfig, saveEncryption} from '../configs/cli.settings.config';
 import {askForPassword} from '../services/cli.settings.services';
-import type {CliSettings} from '../types/cli.settings';
+import type {CliSettings} from '../types/cli/cli.settings';
 import {configFileExists, loadConfig} from '../utils/cli.config.utils';
 import {isHeadless} from '../utils/process.utils';
 import {confirm} from '../utils/prompt.utils';
diff --git a/src/types/cli.config.ts b/src/types/cli/cli.config.ts
similarity index 100%
rename from src/types/cli.config.ts
rename to src/types/cli/cli.config.ts
diff --git a/src/types/cli.env.ts b/src/types/cli/cli.env.ts
similarity index 100%
rename from src/types/cli.env.ts
rename to src/types/cli/cli.env.ts
diff --git a/src/types/cli.options.ts b/src/types/cli/cli.options.ts
similarity index 100%
rename from src/types/cli.options.ts
rename to src/types/cli/cli.options.ts
diff --git a/src/types/cli.settings.ts b/src/types/cli/cli.settings.ts
similarity index 100%
rename from src/types/cli.settings.ts
rename to src/types/cli/cli.settings.ts
diff --git a/src/types/cli.state.ts b/src/types/cli/cli.state.ts
similarity index 100%
rename from src/types/cli.state.ts
rename to src/types/cli/cli.state.ts
diff --git a/src/utils/cli.config.utils.ts b/src/utils/cli.config.utils.ts
index bafc168d..4540a754 100644
--- a/src/utils/cli.config.utils.ts
+++ b/src/utils/cli.config.utils.ts
@@ -5,7 +5,7 @@ import {existsSync} from 'node:fs';
 import {resolve} from 'node:path';
 import {getCliOrbiters, getCliSatellites} from '../configs/cli.config';
 import {CONFIG_OPTIONS} from '../constants/config.constants';
-import type {CliConfig} from '../types/cli.config';
+import type {CliConfig} from '../types/cli/cli.config';
 
 export const loadConfig = (encryptionKey: string | undefined): Conf<CliConfig> => {
   return new Conf<CliConfig>({