diff --git a/packages/cli/src/commands/MemLabRunCommand.ts b/packages/cli/src/commands/MemLabRunCommand.ts
index 7c861d454..a2f00998c 100644
--- a/packages/cli/src/commands/MemLabRunCommand.ts
+++ b/packages/cli/src/commands/MemLabRunCommand.ts
@@ -18,10 +18,10 @@ import CheckLeakCommand from './heap/CheckLeakCommand';
 import InitDirectoryCommand from './InitDirectoryCommand';
 import TakeSnapshotCommand from './snapshot/TakeSnapshotCommand';
 import SetWorkingDirectoryOption from '../options/SetWorkingDirectoryOption';
-import AppOption from '../options/AppOption';
-import InteractionOption from '../options/InteractionOption';
-import SkipSnapshotOption from '../options/SkipSnapshotOption';
-import RunningModeOption from '../options/RunningModeOption';
+import AppOption from '../options/e2e/AppOption';
+import InteractionOption from '../options/e2e/InteractionOption';
+import SkipSnapshotOption from '../options/e2e/SkipSnapshotOption';
+import RunningModeOption from '../options/e2e/RunningModeOption';
 import BaselineFileOption from '../options/heap/BaselineFileOption';
 import TargetFileOption from '../options/heap/TargetFileOption';
 import FinalFileOption from '../options/heap/FinalFileOption';
diff --git a/packages/cli/src/commands/RunMeasureCommand.ts b/packages/cli/src/commands/RunMeasureCommand.ts
index bf6962e5d..1835b1e9c 100644
--- a/packages/cli/src/commands/RunMeasureCommand.ts
+++ b/packages/cli/src/commands/RunMeasureCommand.ts
@@ -15,21 +15,21 @@ import InitDirectoryCommand from './InitDirectoryCommand';
 import {modes, config, BaseOption} from '@memlab/core';
 import CleanRunDataCommand from './CleanRunDataCommand';
 import {runPageInteractionFromCLI} from './snapshot/Snapshot';
-import AppOption from '../options/AppOption';
-import FullExecutionOption from '../options/FullExecutionOption';
-import InteractionOption from '../options/InteractionOption';
-import SkipScreenshotOption from '../options/SkipScreenshotOption';
-import SkipSnapshotOption from '../options/SkipSnapshotOption';
-import SkipGCOption from '../options/SkipGCOption';
-import SkipScrollOption from '../options/SkipScrollOption';
-import SkipExtraOperationOption from '../options/SkipExtraOperationOption';
-import RunningModeOption from '../options/RunningModeOption';
-import RemoteBrowserDebugOption from '../options/RemoteBrowserDebugOption';
-import ScenarioFileOption from '../options/ScenarioFileOption';
-import SetDeviceOption from '../options/SetDeviceOption';
-import DisableXvfbOption from '../options/DisableXvfbOption';
+import AppOption from '../options/e2e/AppOption';
+import FullExecutionOption from '../options/e2e/FullExecutionOption';
+import InteractionOption from '../options/e2e/InteractionOption';
+import SkipScreenshotOption from '../options/e2e/SkipScreenshotOption';
+import SkipSnapshotOption from '../options/e2e/SkipSnapshotOption';
+import SkipGCOption from '../options/e2e/SkipGCOption';
+import SkipScrollOption from '../options/e2e/SkipScrollOption';
+import SkipExtraOperationOption from '../options/e2e/SkipExtraOperationOption';
+import RunningModeOption from '../options/e2e/RunningModeOption';
+import RemoteBrowserDebugOption from '../options/e2e/RemoteBrowserDebugOption';
+import ScenarioFileOption from '../options/e2e/ScenarioFileOption';
+import SetDeviceOption from '../options/e2e/SetDeviceOption';
+import DisableXvfbOption from '../options/e2e/DisableXvfbOption';
 import NumberOfRunsOption from '../options/NumberOfRunsOption';
-import HeadfulBrowserOption from '../options/HeadfulBrowserOption';
+import HeadfulBrowserOption from '../options/e2e/HeadfulBrowserOption';
 
 export default class RunMeasureCommand extends BaseCommand {
   getCommandName(): string {
diff --git a/packages/cli/src/commands/WarmupAppCommand.ts b/packages/cli/src/commands/WarmupAppCommand.ts
index fc580db9b..fa767da21 100644
--- a/packages/cli/src/commands/WarmupAppCommand.ts
+++ b/packages/cli/src/commands/WarmupAppCommand.ts
@@ -14,16 +14,16 @@ import {BaseOption} from '@memlab/core';
 import BaseCommand from '../BaseCommand';
 import {warmup} from '@memlab/api';
 import InitDirectoryCommand from './InitDirectoryCommand';
-import AppOption from '../options/AppOption';
-import InteractionOption from '../options/InteractionOption';
-import RunningModeOption from '../options/RunningModeOption';
-import RemoteBrowserDebugOption from '../options/RemoteBrowserDebugOption';
-import ScenarioFileOption from '../options/ScenarioFileOption';
-import SetDeviceOption from '../options/SetDeviceOption';
-import DisableXvfbOption from '../options/DisableXvfbOption';
-import SkipWarmupOption from '../options/SkipWarmupOption';
+import AppOption from '../options/e2e/AppOption';
+import InteractionOption from '../options/e2e/InteractionOption';
+import RunningModeOption from '../options/e2e/RunningModeOption';
+import RemoteBrowserDebugOption from '../options/e2e/RemoteBrowserDebugOption';
+import ScenarioFileOption from '../options/e2e/ScenarioFileOption';
+import SetDeviceOption from '../options/e2e/SetDeviceOption';
+import DisableXvfbOption from '../options/e2e/DisableXvfbOption';
+import SkipWarmupOption from '../options/e2e/SkipWarmupOption';
 import CheckXvfbSupportCommand from './snapshot/CheckXvfbSupportCommand';
-import HeadfulBrowserOption from '../options/HeadfulBrowserOption';
+import HeadfulBrowserOption from '../options/e2e/HeadfulBrowserOption';
 
 export default class FBWarmupAppCommand extends BaseCommand {
   getCommandName(): string {
diff --git a/packages/cli/src/commands/heap/GetRetainerTraceCommand.ts b/packages/cli/src/commands/heap/GetRetainerTraceCommand.ts
index 49f77d103..34d2033cb 100644
--- a/packages/cli/src/commands/heap/GetRetainerTraceCommand.ts
+++ b/packages/cli/src/commands/heap/GetRetainerTraceCommand.ts
@@ -15,7 +15,7 @@ import BaseCommand, {CommandCategory} from '../../BaseCommand';
 import {BaseOption, analysis, utils} from '@memlab/core';
 import SnapshotFileOption from '../../options/heap/SnapshotFileOption';
 import JSEngineOption from '../../options/heap/JSEngineOption';
-import HeapNodeIdOption from '../../options/HeapNodeIdOption';
+import HeapNodeIdOption from '../../options/heap/HeapNodeIdOption';
 import SnapshotDirectoryOption from '../../options/heap/SnapshotDirectoryOption';
 import {fileManager} from '@memlab/core';
 
diff --git a/packages/cli/src/commands/heap/interactive/InteractiveHeapExploreCommand.ts b/packages/cli/src/commands/heap/interactive/InteractiveHeapExploreCommand.ts
index 7f7370afc..089492730 100644
--- a/packages/cli/src/commands/heap/interactive/InteractiveHeapExploreCommand.ts
+++ b/packages/cli/src/commands/heap/interactive/InteractiveHeapExploreCommand.ts
@@ -24,7 +24,7 @@ import BaseCommand, {CommandCategory} from '../../../BaseCommand';
 import SnapshotFileOption from '../../../options/heap/SnapshotFileOption';
 import JSEngineOption from '../../../options/heap/JSEngineOption';
 import CliScreen from './ui-components/CliScreen';
-import HeapNodeIdOption from '../../../options/HeapNodeIdOption';
+import HeapNodeIdOption from '../../../options/heap/HeapNodeIdOption';
 import MLClusteringOption from '../../../options/MLClusteringOption';
 
 export default class InteractiveHeapViewCommand extends BaseCommand {
diff --git a/packages/cli/src/commands/snapshot/TakeSnapshotCommand.ts b/packages/cli/src/commands/snapshot/TakeSnapshotCommand.ts
index 9a6c8ed7a..35301ce80 100644
--- a/packages/cli/src/commands/snapshot/TakeSnapshotCommand.ts
+++ b/packages/cli/src/commands/snapshot/TakeSnapshotCommand.ts
@@ -14,22 +14,22 @@ import BaseCommand from '../../BaseCommand';
 import {runPageInteractionFromCLI} from './Snapshot';
 import CleanRunDataCommand from '../CleanRunDataCommand';
 import {BaseOption} from '@memlab/core';
-import FullExecutionOption from '../../options/FullExecutionOption';
-import AppOption from '../../options/AppOption';
-import InteractionOption from '../../options/InteractionOption';
-import SkipSnapshotOption from '../../options/SkipSnapshotOption';
-import SkipScreenshotOption from '../../options/SkipScreenshotOption';
-import SkipGCOption from '../../options/SkipGCOption';
-import SkipScrollOption from '../../options/SkipScrollOption';
-import SkipExtraOperationOption from '../../options/SkipExtraOperationOption';
-import RunningModeOption from '../../options/RunningModeOption';
-import RemoteBrowserDebugOption from '../../options/RemoteBrowserDebugOption';
-import ScenarioFileOption from '../../options/ScenarioFileOption';
-import SetDeviceOption from '../../options/SetDeviceOption';
-import DisableXvfbOption from '../../options/DisableXvfbOption';
+import FullExecutionOption from '../../options/e2e/FullExecutionOption';
+import AppOption from '../../options/e2e/AppOption';
+import InteractionOption from '../../options/e2e/InteractionOption';
+import SkipSnapshotOption from '../../options/e2e/SkipSnapshotOption';
+import SkipScreenshotOption from '../../options/e2e/SkipScreenshotOption';
+import SkipGCOption from '../../options/e2e/SkipGCOption';
+import SkipScrollOption from '../../options/e2e/SkipScrollOption';
+import SkipExtraOperationOption from '../../options/e2e/SkipExtraOperationOption';
+import RunningModeOption from '../../options/e2e/RunningModeOption';
+import RemoteBrowserDebugOption from '../../options/e2e/RemoteBrowserDebugOption';
+import ScenarioFileOption from '../../options/e2e/ScenarioFileOption';
+import SetDeviceOption from '../../options/e2e/SetDeviceOption';
+import DisableXvfbOption from '../../options/e2e/DisableXvfbOption';
 import InitDirectoryCommand from '../InitDirectoryCommand';
 import CheckXvfbSupportCommand from './CheckXvfbSupportCommand';
-import HeadfulBrowserOption from '../../options/HeadfulBrowserOption';
+import HeadfulBrowserOption from '../../options/e2e/HeadfulBrowserOption';
 
 export default class TakeSnapshotCommand extends BaseCommand {
   getCommandName(): string {
diff --git a/packages/cli/src/options/AppOption.ts b/packages/cli/src/options/e2e/AppOption.ts
similarity index 100%
rename from packages/cli/src/options/AppOption.ts
rename to packages/cli/src/options/e2e/AppOption.ts
diff --git a/packages/cli/src/options/DisableXvfbOption.ts b/packages/cli/src/options/e2e/DisableXvfbOption.ts
similarity index 100%
rename from packages/cli/src/options/DisableXvfbOption.ts
rename to packages/cli/src/options/e2e/DisableXvfbOption.ts
diff --git a/packages/cli/src/options/FullExecutionOption.ts b/packages/cli/src/options/e2e/FullExecutionOption.ts
similarity index 100%
rename from packages/cli/src/options/FullExecutionOption.ts
rename to packages/cli/src/options/e2e/FullExecutionOption.ts
diff --git a/packages/cli/src/options/HeadfulBrowserOption.ts b/packages/cli/src/options/e2e/HeadfulBrowserOption.ts
similarity index 100%
rename from packages/cli/src/options/HeadfulBrowserOption.ts
rename to packages/cli/src/options/e2e/HeadfulBrowserOption.ts
diff --git a/packages/cli/src/options/InteractionOption.ts b/packages/cli/src/options/e2e/InteractionOption.ts
similarity index 100%
rename from packages/cli/src/options/InteractionOption.ts
rename to packages/cli/src/options/e2e/InteractionOption.ts
diff --git a/packages/cli/src/options/RemoteBrowserDebugOption.ts b/packages/cli/src/options/e2e/RemoteBrowserDebugOption.ts
similarity index 100%
rename from packages/cli/src/options/RemoteBrowserDebugOption.ts
rename to packages/cli/src/options/e2e/RemoteBrowserDebugOption.ts
diff --git a/packages/cli/src/options/RunningModeOption.ts b/packages/cli/src/options/e2e/RunningModeOption.ts
similarity index 100%
rename from packages/cli/src/options/RunningModeOption.ts
rename to packages/cli/src/options/e2e/RunningModeOption.ts
diff --git a/packages/cli/src/options/ScenarioFileOption.ts b/packages/cli/src/options/e2e/ScenarioFileOption.ts
similarity index 100%
rename from packages/cli/src/options/ScenarioFileOption.ts
rename to packages/cli/src/options/e2e/ScenarioFileOption.ts
diff --git a/packages/cli/src/options/SetDeviceOption.ts b/packages/cli/src/options/e2e/SetDeviceOption.ts
similarity index 100%
rename from packages/cli/src/options/SetDeviceOption.ts
rename to packages/cli/src/options/e2e/SetDeviceOption.ts
diff --git a/packages/cli/src/options/SkipExtraOperationOption.ts b/packages/cli/src/options/e2e/SkipExtraOperationOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipExtraOperationOption.ts
rename to packages/cli/src/options/e2e/SkipExtraOperationOption.ts
diff --git a/packages/cli/src/options/SkipGCOption.ts b/packages/cli/src/options/e2e/SkipGCOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipGCOption.ts
rename to packages/cli/src/options/e2e/SkipGCOption.ts
diff --git a/packages/cli/src/options/SkipScreenshotOption.ts b/packages/cli/src/options/e2e/SkipScreenshotOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipScreenshotOption.ts
rename to packages/cli/src/options/e2e/SkipScreenshotOption.ts
diff --git a/packages/cli/src/options/SkipScrollOption.ts b/packages/cli/src/options/e2e/SkipScrollOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipScrollOption.ts
rename to packages/cli/src/options/e2e/SkipScrollOption.ts
diff --git a/packages/cli/src/options/SkipSnapshotOption.ts b/packages/cli/src/options/e2e/SkipSnapshotOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipSnapshotOption.ts
rename to packages/cli/src/options/e2e/SkipSnapshotOption.ts
diff --git a/packages/cli/src/options/SkipWarmupOption.ts b/packages/cli/src/options/e2e/SkipWarmupOption.ts
similarity index 100%
rename from packages/cli/src/options/SkipWarmupOption.ts
rename to packages/cli/src/options/e2e/SkipWarmupOption.ts
diff --git a/packages/cli/src/options/HeapNodeIdOption.ts b/packages/cli/src/options/heap/HeapNodeIdOption.ts
similarity index 100%
rename from packages/cli/src/options/HeapNodeIdOption.ts
rename to packages/cli/src/options/heap/HeapNodeIdOption.ts