diff --git a/src/cli/commands/force/lightning/local/__tests__/setup.test.ts b/src/cli/commands/force/lightning/local/__tests__/setup.test.ts
index b18208c..ca19d40 100644
--- a/src/cli/commands/force/lightning/local/__tests__/setup.test.ts
+++ b/src/cli/commands/force/lightning/local/__tests__/setup.test.ts
@@ -7,8 +7,10 @@
 
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { RequirementProcessor } from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+import {
+    CommonUtils,
+    RequirementProcessor
+} from '@salesforce/lwc-dev-mobile-core';
 import { Setup } from '../setup';
 
 describe('Setup Tests', () => {
diff --git a/src/cli/commands/force/lightning/local/device/__tests__/create.test.ts b/src/cli/commands/force/lightning/local/device/__tests__/create.test.ts
index 9825a73..dbea64c 100644
--- a/src/cli/commands/force/lightning/local/device/__tests__/create.test.ts
+++ b/src/cli/commands/force/lightning/local/device/__tests__/create.test.ts
@@ -8,12 +8,14 @@
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger } from '@salesforce/core';
-import { AndroidPackage } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidTypes';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { Version } from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import { RequirementProcessor } from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+import {
+    AndroidPackage,
+    AndroidUtils,
+    CommonUtils,
+    IOSUtils,
+    RequirementProcessor,
+    Version
+} from '@salesforce/lwc-dev-mobile-core';
 import { Create } from '../create';
 
 describe('Create Tests', () => {
diff --git a/src/cli/commands/force/lightning/local/device/__tests__/list.test.ts b/src/cli/commands/force/lightning/local/device/__tests__/list.test.ts
index 53b77a1..cba2202 100644
--- a/src/cli/commands/force/lightning/local/device/__tests__/list.test.ts
+++ b/src/cli/commands/force/lightning/local/device/__tests__/list.test.ts
@@ -8,11 +8,13 @@
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger } from '@salesforce/core';
-import { AndroidVirtualDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidTypes';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { Version } from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { IOSSimulatorDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSTypes';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
+import {
+    AndroidVirtualDevice,
+    AndroidUtils,
+    IOSSimulatorDevice,
+    IOSUtils,
+    Version
+} from '@salesforce/lwc-dev-mobile-core';
 import { List } from '../list';
 
 describe('List Tests', () => {
diff --git a/src/cli/commands/force/lightning/local/device/__tests__/start.test.ts b/src/cli/commands/force/lightning/local/device/__tests__/start.test.ts
index d974cd9..380700d 100644
--- a/src/cli/commands/force/lightning/local/device/__tests__/start.test.ts
+++ b/src/cli/commands/force/lightning/local/device/__tests__/start.test.ts
@@ -8,11 +8,13 @@
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger } from '@salesforce/core';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSSimulatorDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSTypes';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import { RequirementProcessor } from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+import {
+    AndroidUtils,
+    CommonUtils,
+    IOSSimulatorDevice,
+    IOSUtils,
+    RequirementProcessor
+} from '@salesforce/lwc-dev-mobile-core';
 import { Start } from '../start';
 
 describe('Start Tests', () => {
diff --git a/src/cli/commands/force/lightning/local/device/create.ts b/src/cli/commands/force/lightning/local/device/create.ts
index cf939f1..0d9841b 100644
--- a/src/cli/commands/force/lightning/local/device/create.ts
+++ b/src/cli/commands/force/lightning/local/device/create.ts
@@ -7,21 +7,19 @@
 
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Logger, Messages } from '@salesforce/core';
-import { AndroidEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidEnvironmentRequirements';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
 import {
+    AndroidEnvironmentRequirements,
+    AndroidUtils,
+    BaseCommand,
     CommandLineUtils,
-    FlagsConfigType
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSEnvironmentRequirements';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import {
-    Requirement,
     CommandRequirements,
+    CommonUtils,
+    FlagsConfigType,
+    IOSEnvironmentRequirements,
+    IOSUtils,
+    Requirement,
     RequirementProcessor
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+} from '@salesforce/lwc-dev-mobile-core';
 import util from 'util';
 
 // Initialize Messages with the current plugin directory
diff --git a/src/cli/commands/force/lightning/local/device/list.ts b/src/cli/commands/force/lightning/local/device/list.ts
index 85122ba..70c3d7e 100644
--- a/src/cli/commands/force/lightning/local/device/list.ts
+++ b/src/cli/commands/force/lightning/local/device/list.ts
@@ -6,15 +6,15 @@
  */
 
 import { Messages } from '@salesforce/core';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
 import {
+    AndroidUtils,
+    BaseCommand,
     CommandLineUtils,
-    FlagsConfigType
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import { PerformanceMarkers } from '@salesforce/lwc-dev-mobile-core/lib/common/PerformanceMarkers';
+    CommonUtils,
+    FlagsConfigType,
+    IOSUtils,
+    PerformanceMarkers
+} from '@salesforce/lwc-dev-mobile-core';
 import chalk from 'chalk';
 import { ux } from '@oclif/core';
 import { performance, PerformanceObserver } from 'perf_hooks';
diff --git a/src/cli/commands/force/lightning/local/device/start.ts b/src/cli/commands/force/lightning/local/device/start.ts
index d5fb132..519d995 100644
--- a/src/cli/commands/force/lightning/local/device/start.ts
+++ b/src/cli/commands/force/lightning/local/device/start.ts
@@ -7,20 +7,18 @@
 
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
-import { AndroidEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidEnvironmentRequirements';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
 import {
+    AndroidEnvironmentRequirements,
+    AndroidUtils,
+    BaseCommand,
     CommandLineUtils,
-    FlagsConfigType
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSEnvironmentRequirements';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import {
     CommandRequirements,
+    CommonUtils,
+    FlagsConfigType,
+    IOSEnvironmentRequirements,
+    IOSUtils,
     RequirementProcessor
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+} from '@salesforce/lwc-dev-mobile-core';
 import util from 'util';
 
 // Initialize Messages with the current plugin directory
diff --git a/src/cli/commands/force/lightning/local/setup.ts b/src/cli/commands/force/lightning/local/setup.ts
index 4d1eb9d..344da67 100644
--- a/src/cli/commands/force/lightning/local/setup.ts
+++ b/src/cli/commands/force/lightning/local/setup.ts
@@ -5,7 +5,7 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 
-import { Setup as CoreSetup } from '@salesforce/lwc-dev-mobile-core/lib/cli/commands/force/lightning/local/setup';
+import { Setup as CoreSetup } from '@salesforce/lwc-dev-mobile-core';
 
 export class Setup extends CoreSetup {
     public async run(): Promise<void> {
diff --git a/src/cli/commands/force/lightning/lwc/__tests__/preview.test.ts b/src/cli/commands/force/lightning/lwc/__tests__/preview.test.ts
index 7780c06..232cd0f 100644
--- a/src/cli/commands/force/lightning/lwc/__tests__/preview.test.ts
+++ b/src/cli/commands/force/lightning/lwc/__tests__/preview.test.ts
@@ -9,11 +9,13 @@ process.env['SFDX_ENV'] = 'test'; // run sfdx in test mode when running unit tes
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger, Messages, SfError } from '@salesforce/core';
-import { AndroidLauncher } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidLauncher';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSLauncher } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSLauncher';
-import { PreviewUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/PreviewUtils';
-import { RequirementProcessor } from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+import {
+    AndroidLauncher,
+    CommonUtils,
+    IOSLauncher,
+    PreviewUtils,
+    RequirementProcessor
+} from '@salesforce/lwc-dev-mobile-core';
 import fs from 'fs';
 import {
     LwcServerIsRunningRequirement,
diff --git a/src/cli/commands/force/lightning/lwc/preview.ts b/src/cli/commands/force/lightning/lwc/preview.ts
index 043769b..bd1b3c9 100644
--- a/src/cli/commands/force/lightning/lwc/preview.ts
+++ b/src/cli/commands/force/lightning/lwc/preview.ts
@@ -7,27 +7,23 @@
 
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Logger, Messages, SfError } from '@salesforce/core';
-import { AndroidEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidEnvironmentRequirements';
-import { AndroidLauncher } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidLauncher';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
-import {
-    CommandLineUtils,
-    FlagsConfigType
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSEnvironmentRequirements';
-import { IOSLauncher } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSLauncher';
-import { PlatformConfig } from '@salesforce/lwc-dev-mobile-core/lib/common/PlatformConfig';
 import {
+    AndroidEnvironmentRequirements,
+    AndroidLauncher,
     AndroidAppPreviewConfig,
-    IOSAppPreviewConfig
-} from '@salesforce/lwc-dev-mobile-core/lib/common/PreviewConfigFile';
-import { PreviewUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/PreviewUtils';
-import {
+    BaseCommand,
+    CommandLineUtils,
+    CommonUtils,
     CommandRequirements,
+    FlagsConfigType,
+    IOSEnvironmentRequirements,
+    IOSLauncher,
+    IOSAppPreviewConfig,
+    PlatformConfig,
+    PreviewUtils,
     Requirement,
     RequirementProcessor
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+} from '@salesforce/lwc-dev-mobile-core';
 import fs from 'fs';
 import path from 'path';
 import util from 'util';
diff --git a/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/configure.test.ts b/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/configure.test.ts
index 376ac62..3e8f5a6 100644
--- a/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/configure.test.ts
+++ b/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/configure.test.ts
@@ -8,13 +8,15 @@
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger, Messages, SfError } from '@salesforce/core';
-import { AndroidVirtualDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidTypes';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { Version } from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSSimulatorDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSTypes';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import { RequirementProcessor } from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+import {
+    AndroidVirtualDevice,
+    AndroidUtils,
+    CommonUtils,
+    IOSSimulatorDevice,
+    IOSUtils,
+    RequirementProcessor,
+    Version
+} from '@salesforce/lwc-dev-mobile-core';
 import { Configure } from '../configure';
 import util from 'util';
 
diff --git a/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/run.test.ts b/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/run.test.ts
index 3b587fa..f558e8f 100644
--- a/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/run.test.ts
+++ b/src/cli/commands/force/lightning/lwc/test/ui/mobile/__tests__/run.test.ts
@@ -8,7 +8,7 @@
 import { Config } from '@oclif/core/lib/config';
 import { Options } from '@oclif/core/lib/interfaces';
 import { Logger, Messages } from '@salesforce/core';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
+import { CommonUtils } from '@salesforce/lwc-dev-mobile-core';
 import { Run } from '../run';
 import fs from 'fs';
 import path from 'path';
diff --git a/src/cli/commands/force/lightning/lwc/test/ui/mobile/configure.ts b/src/cli/commands/force/lightning/lwc/test/ui/mobile/configure.ts
index c770be7..5fdca5e 100644
--- a/src/cli/commands/force/lightning/lwc/test/ui/mobile/configure.ts
+++ b/src/cli/commands/force/lightning/lwc/test/ui/mobile/configure.ts
@@ -7,22 +7,20 @@
 
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
-import { AndroidEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidEnvironmentRequirements';
-import { AndroidVirtualDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidTypes';
-import { AndroidUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/AndroidUtils';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
 import {
+    AndroidEnvironmentRequirements,
+    AndroidVirtualDevice,
+    AndroidUtils,
+    BaseCommand,
     CommandLineUtils,
-    FlagsConfigType
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { IOSEnvironmentRequirements } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSEnvironmentRequirements';
-import { IOSSimulatorDevice } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSTypes';
-import { IOSUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/IOSUtils';
-import {
-    RequirementProcessor,
-    CommandRequirements
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Requirements';
+    CommandRequirements,
+    CommonUtils,
+    FlagsConfigType,
+    IOSEnvironmentRequirements,
+    IOSSimulatorDevice,
+    IOSUtils,
+    RequirementProcessor
+} from '@salesforce/lwc-dev-mobile-core';
 import fs from 'fs';
 import util from 'util';
 
diff --git a/src/cli/commands/force/lightning/lwc/test/ui/mobile/run.ts b/src/cli/commands/force/lightning/lwc/test/ui/mobile/run.ts
index 7879992..1bbbc86 100644
--- a/src/cli/commands/force/lightning/lwc/test/ui/mobile/run.ts
+++ b/src/cli/commands/force/lightning/lwc/test/ui/mobile/run.ts
@@ -7,12 +7,12 @@
 
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
-import { BaseCommand } from '@salesforce/lwc-dev-mobile-core/lib/common/BaseCommand';
 import {
-    FlagsConfigType,
-    CommandLineUtils
-} from '@salesforce/lwc-dev-mobile-core/lib/common/Common';
-import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
+    BaseCommand,
+    CommandLineUtils,
+    CommonUtils,
+    FlagsConfigType
+} from '@salesforce/lwc-dev-mobile-core';
 import * as childProcess from 'child_process';
 import util from 'util';
 import fs from 'fs';