NativeScript
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -215,10 +215,10 @@ injector.require(
 
 injector.requireCommand("setup|*", "./commands/setup");
 
-injector.requirePublic("packageManager", "./package-manager");
-injector.requirePublic("npm", "./node-package-manager");
-injector.requirePublic("yarn", "./yarn-package-manager");
-injector.requirePublic("pnpm", "./pnpm-package-manager");
+injector.requirePublic("packageManager", "./package-managers/index");
+injector.requirePublic("npm", "./package-managers/npm");
+injector.requirePublic("pnpm", "./package-managers/pnpm");
+injector.requirePublic("yarn", "./package-managers/yarn");
 injector.requireCommand(
 	"package-manager|*get",
 	"./commands/package-manager-get"
@@ -230,7 +230,7 @@ injector.requireCommand(
 
 injector.require(
 	"packageInstallationManager",
-	"./package-installation-manager"
+	"./package-managers/package-installation-manager"
 );
 
 injector.require("deviceLogProvider", "./common/mobile/device-log-provider");

diff --git a/lib/common/mobile/application-manager-base.ts b/lib/common/mobile/application-manager-base.ts
@@ -122,9 +122,7 @@ export abstract class ApplicationManagerBase
 		appIdentifier?: string,
 		buildData?: IBuildData
 	): Promise<void>;
-	public abstract uninstallApplication(
-		appIdentifier: string
-	): Promise<void>;
+	public abstract uninstallApplication(appIdentifier: string): Promise<void>;
 	public abstract startApplication(
 		appData: Mobile.IApplicationData
 	): Promise<void>;

diff --git a/lib/common/mobile/ios/ios-device-base.ts b/lib/common/mobile/ios/ios-device-base.ts
@@ -57,9 +57,7 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 		}, `ios-debug-socket-${this.deviceInfo.identifier}-${appId}.lock`);
 	}
 
-	protected abstract getDebugSocketCore(
-		appId: string
-	): Promise<net.Socket>;
+	protected abstract getDebugSocketCore(appId: string): Promise<net.Socket>;
 
 	protected async attachToDebuggerFoundEvent(
 		appId: string,

diff --git a/lib/common/mobile/ios/simulator/ios-simulator-device.ts b/lib/common/mobile/ios/simulator/ios-simulator-device.ts
@@ -99,7 +99,7 @@ export class IOSSimulator extends IOSDeviceBase implements Mobile.IiOSDevice {
 				.catch((e) => this.$logger.error(e));
 		}, 5e3);
 
-		// the internal retry-mechanism of getDebuggerPort will ensure the above 
+		// the internal retry-mechanism of getDebuggerPort will ensure the above
 		// interval has a chance to execute multiple times
 		const port = await super.getDebuggerPort(appId).finally(() => {
 			clearInterval(postNotificationRetryInterval);

diff --git a/lib/common/services/hooks-service.ts b/lib/common/services/hooks-service.ts
@@ -304,8 +304,10 @@ export class HooksService implements IHooksService {
 
 	private getCustomHooksByName(hookName: string): IHook[] {
 		const hooks: IHook[] = [];
-		const customHooks: INsConfigHooks[] =
-			this.$projectConfigService.getValue("hooks", []);
+		const customHooks: INsConfigHooks[] = this.$projectConfigService.getValue(
+			"hooks",
+			[]
+		);
 
 		for (const cHook of customHooks) {
 			if (cHook.type === hookName) {

diff --git a/lib/options.ts b/lib/options.ts
@@ -1,6 +1,6 @@
 import * as helpers from "./common/helpers";
-import * as yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
+import * as yargs from "yargs";
+import { hideBin } from "yargs/helpers";
 import * as _ from "lodash";
 import {
 	IDictionary,

diff --git a/lib/base-package-manager.ts → lib/package-managers/base-package-manager.ts b/lib/base-package-manager.ts → lib/package-managers/base-package-manager.ts
@@ -1,17 +1,17 @@
-import { isInteractive } from "./common/helpers";
+import { isInteractive } from "../common/helpers";
 import {
 	INodePackageManager,
 	INodePackageManagerInstallOptions,
 	INpmInstallResultInfo,
 	INpmsResult,
 	INpmPackageNameParts,
-} from "./declarations";
+} from "../declarations";
 import {
 	IDictionary,
 	IChildProcess,
 	IFileSystem,
 	IHostInfo,
-} from "./common/declarations";
+} from "../common/declarations";
 
 export abstract class BasePackageManager implements INodePackageManager {
 	public abstract install(

diff --git a/lib/package-managers/declarations.d.ts b/lib/package-managers/declarations.d.ts
@@ -0,0 +1,75 @@
+// This is a WIP declaration file and it is not being used yet
+
+interface IPackageJSON {
+	name?: string;
+	version?: string;
+	dependencies?: any;
+	devDependencies?: any;
+
+	[key: string]: any;
+}
+
+interface IPackageInfo {
+	name: string;
+	version: string;
+}
+
+/**
+ * A package identifier can be any of the following:
+ *  - <package name>
+ *  - <package name>@<version>
+ *  - <package name>@<version range>
+ *  - <package name>@<tag>
+ *  - <git repo url>
+ *  - <tarball url>
+ *  - <tarball file>
+ *  - <folder>
+ */
+type IPackageIdentifier = string;
+
+interface IPackageManagerOptions {
+	projectPath?: string;
+}
+interface IPackageManagerAddOptions extends IPackageManagerOptions {
+	version?: string;
+	exact?: boolean;
+	scripts?: boolean;
+
+	// these 3 are shared with the remove options, however
+	// they are duplicated as they don't quite make sense
+	// to be added to IPackageManagerOptions as they are
+	// specific to add and remove operations
+	save?: boolean;
+	dev?: boolean;
+	optional?: boolean;
+}
+interface IPackageManagerRemoveOptions extends IPackageManagerOptions {
+	save?: boolean;
+	dev?: boolean;
+	optional?: boolean;
+}
+
+interface IPackageManager {
+	add(
+		packageIdentifier: IPackageIdentifier,
+		options?: IPackageManagerAddOptions
+	): Promise<IPackageInfo>;
+	install(
+		packageIdentifier: IPackageIdentifier,
+		options?: IPackageManagerAddOptions
+	): Promise<IPackageInfo>;
+
+	remove(
+		packageIdentifier: IPackageIdentifier,
+		options?: IPackageManagerRemoveOptions
+	): Promise<IPackageInfo>;
+	uninstall(
+		packageIdentifier: IPackageIdentifier,
+		options?: IPackageManagerRemoveOptions
+	): Promise<IPackageInfo>;
+
+	getInstalledPackage(
+		packageIdentifier: IPackageIdentifier
+	): Promise<IPackageInfo>;
+	getPackageJson(packageIdentifier: IPackageIdentifier): Promise<IPackageJSON>;
+}
diff --git a/lib/package-manager.ts → lib/package-managers/index.ts b/lib/package-manager.ts → lib/package-managers/index.ts
@@ -1,6 +1,6 @@
-import { cache, exported, invokeInit } from "./common/decorators";
-import { performanceLog } from "./common/decorators";
-import { PackageManagers } from "./constants";
+import { cache, exported, invokeInit } from "../common/decorators";
+import { performanceLog } from "../common/decorators";
+import { PackageManagers } from "../constants";
 import {
 	IPackageManager,
 	INodePackageManager,
@@ -9,14 +9,14 @@ import {
 	INpmInstallResultInfo,
 	INpmsResult,
 	INpmPackageNameParts,
-} from "./declarations";
+} from "../declarations";
 import {
 	IErrors,
 	IUserSettingsService,
 	IDictionary,
-} from "./common/declarations";
-import { injector } from "./common/yok";
-import { IProjectConfigService } from "./definitions/project";
+} from "../common/declarations";
+import { injector } from "../common/yok";
+import { IProjectConfigService } from "../definitions/project";
 export class PackageManager implements IPackageManager {
 	private packageManager: INodePackageManager;
 	private _packageManagerName: string;
@@ -174,4 +174,8 @@ export class PackageManager implements IPackageManager {
 	}
 }
 
+// export { NPM } from './npm'
+// export { PNPM } from './pnpm'
+// export { Yarn } from './yarn'
+
 injector.register("packageManager", PackageManager);
diff --git a/lib/node-package-manager.ts → lib/package-managers/npm.ts b/lib/node-package-manager.ts → lib/package-managers/npm.ts
@@ -1,23 +1,23 @@
 import { join, relative } from "path";
 import { BasePackageManager } from "./base-package-manager";
-import { exported, cache } from "./common/decorators";
-import { CACACHE_DIRECTORY_NAME } from "./constants";
+import { exported, cache } from "../common/decorators";
+import { CACACHE_DIRECTORY_NAME } from "../constants";
 import * as _ from "lodash";
 import {
 	INodePackageManagerInstallOptions,
 	INpmInstallResultInfo,
 	INpmsResult,
-} from "./declarations";
+} from "../declarations";
 import {
 	IChildProcess,
 	IErrors,
 	IFileSystem,
 	IHostInfo,
 	Server,
-} from "./common/declarations";
-import { injector } from "./common/yok";
+} from "../common/declarations";
+import { injector } from "../common/yok";
 
-export class NodePackageManager extends BasePackageManager {
+export class NPM extends BasePackageManager {
 	constructor(
 		$childProcess: IChildProcess,
 		private $errors: IErrors,
@@ -172,4 +172,4 @@ export class NodePackageManager extends BasePackageManager {
 	}
 }
 
-injector.register("npm", NodePackageManager);
+injector.register("npm", NPM);
diff --git a/lib/package-installation-manager.ts → ...-managers/package-installation-manager.ts b/lib/package-installation-manager.ts → ...-managers/package-installation-manager.ts
@@ -1,20 +1,20 @@
 import * as path from "path";
-import * as constants from "./constants";
+import * as constants from "../constants";
 import {
 	INpmInstallOptions,
 	INpmInstallResultInfo,
 	IPackageInstallationManager,
 	IPackageManager,
 	IStaticConfig,
-} from "./declarations";
-import { IProjectDataService } from "./definitions/project";
+} from "../declarations";
+import { IProjectDataService } from "../definitions/project";
 import {
 	IChildProcess,
 	IDictionary,
 	IFileSystem,
 	ISettingsService,
-} from "./common/declarations";
-import { injector } from "./common/yok";
+} from "../common/declarations";
+import { injector } from "../common/yok";
 
 const semver = require("semver");
 

diff --git a/lib/pnpm-package-manager.ts → lib/package-managers/pnpm.ts b/lib/pnpm-package-manager.ts → lib/package-managers/pnpm.ts
@@ -1,24 +1,24 @@
 import * as path from "path";
 import * as _ from "lodash";
 import { BasePackageManager } from "./base-package-manager";
-import { exported } from "./common/decorators";
-import { CACACHE_DIRECTORY_NAME } from "./constants";
+import { exported } from "../common/decorators";
+import { CACACHE_DIRECTORY_NAME } from "../constants";
 import {
 	INodePackageManagerInstallOptions,
 	INpmInstallResultInfo,
 	INpmsResult,
-} from "./declarations";
+} from "../declarations";
 import {
 	IChildProcess,
 	IErrors,
 	IFileSystem,
 	IHostInfo,
 	Server,
 	IDictionary,
-} from "./common/declarations";
-import { injector } from "./common/yok";
+} from "../common/declarations";
+import { injector } from "../common/yok";
 
-export class PnpmPackageManager extends BasePackageManager {
+export class PNPM extends BasePackageManager {
 	constructor(
 		$childProcess: IChildProcess,
 		private $errors: IErrors,
@@ -149,4 +149,4 @@ export class PnpmPackageManager extends BasePackageManager {
 	}
 }
 
-injector.register("pnpm", PnpmPackageManager);
+injector.register("pnpm", PNPM);
diff --git a/lib/yarn-package-manager.ts → lib/package-managers/yarn.ts b/lib/yarn-package-manager.ts → lib/package-managers/yarn.ts
@@ -1,23 +1,23 @@
 import * as path from "path";
 import * as _ from "lodash";
 import { BasePackageManager } from "./base-package-manager";
-import { exported } from "./common/decorators";
+import { exported } from "../common/decorators";
 import {
 	INodePackageManagerInstallOptions,
 	INpmInstallResultInfo,
 	INpmsResult,
-} from "./declarations";
+} from "../declarations";
 import {
 	IChildProcess,
 	IErrors,
 	IFileSystem,
 	IHostInfo,
 	Server,
 	IDictionary,
-} from "./common/declarations";
-import { injector } from "./common/yok";
+} from "../common/declarations";
+import { injector } from "../common/yok";
 
-export class YarnPackageManager extends BasePackageManager {
+export class Yarn extends BasePackageManager {
 	constructor(
 		$childProcess: IChildProcess,
 		private $errors: IErrors,
@@ -147,4 +147,4 @@ export class YarnPackageManager extends BasePackageManager {
 	}
 }
 
-injector.register("yarn", YarnPackageManager);
+injector.register("yarn", Yarn);
diff --git a/lib/tools/node-modules/node-modules-builder.ts b/lib/tools/node-modules/node-modules-builder.ts
@@ -19,7 +19,8 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 		projectData,
 	}: IPrepareNodeModulesData): Promise<void> {
 		let dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(
-			projectData.projectDir, projectData.ignoredDependencies
+			projectData.projectDir,
+			projectData.ignoredDependencies
 		);
 		dependencies = await platformData.platformProjectService.beforePrepareAllPlugins(
 			projectData,