diff --git a/lib/commands/list-platforms.ts b/lib/commands/list-platforms.ts
index 196dc87526..cf19ba174c 100644
--- a/lib/commands/list-platforms.ts
+++ b/lib/commands/list-platforms.ts
@@ -1,7 +1,7 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-import helpers = require("./../common/helpers");
+import * as helpers from "../common/helpers";
 
 export class ListPlatformsCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
diff --git a/lib/common b/lib/common
index 04e06cbe21..922115bbfb 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 04e06cbe21ba430bfe63949a637e75d5251b0430
+Subproject commit 922115bbfbd80657c70cc2e4557ab90284d9e816
diff --git a/lib/lockfile.ts b/lib/lockfile.ts
index 25ef0462e5..abb6b480df 100644
--- a/lib/lockfile.ts
+++ b/lib/lockfile.ts
@@ -2,7 +2,7 @@
 "use strict";
 
 import Future = require("fibers/future");
-import lockfile = require("lockfile");
+import * as lockfile from "lockfile";
 import * as path from "path";
 
 export class LockFile implements ILockFile {
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
index bb7b46cd69..eca0d38dd3 100644
--- a/lib/nativescript-cli.ts
+++ b/lib/nativescript-cli.ts
@@ -5,7 +5,7 @@
 require("./common/verify-node-version").verifyNodeVersion(require("../package.json").engines.node);
 
 require("./bootstrap");
-import fiber = require("fibers");
+import * as fiber from "fibers";
 import Future = require("fibers/future");
 import {installUncaughtExceptionListener} from "./common/errors";
 installUncaughtExceptionListener(process.exit);
diff --git a/lib/npm-installation-manager.ts b/lib/npm-installation-manager.ts
index 2498150338..11a1cdd2e4 100644
--- a/lib/npm-installation-manager.ts
+++ b/lib/npm-installation-manager.ts
@@ -2,7 +2,7 @@
 "use strict";
 
 import * as path from "path";
-import semver = require("semver");
+import * as semver from "semver";
 import * as npm from "npm";
 import * as constants from "./constants";
 
diff --git a/lib/services/init-service.ts b/lib/services/init-service.ts
index bfdd861a52..244053198e 100644
--- a/lib/services/init-service.ts
+++ b/lib/services/init-service.ts
@@ -1,10 +1,10 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-import constants = require("../constants");
+import * as constants from "../constants";
 import * as helpers from "../common/helpers";
 import * as path from "path";
-import semver = require("semver");
+import * as semver from "semver";
 
 export class InitService implements IInitService {
 	private static MIN_SUPPORTED_FRAMEWORK_VERSIONS: IStringDictionary = {
diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts
index 034812d5d4..870218e197 100644
--- a/lib/services/ios-debug-service.ts
+++ b/lib/services/ios-debug-service.ts
@@ -4,11 +4,11 @@
 import * as iOSProxyServices from "../common/mobile/ios/ios-proxy-services";
 import * as iOSDevice from "../common/mobile/ios/ios-device";
 import * as net from "net";
-import ws = require("ws");
+import * as ws from "ws";
 import * as stream from "stream";
 import * as path from "path";
 import Future = require("fibers/future");
-import semver = require("semver");
+import * as semver from "semver";
 import temp = require("temp");
 import byline = require("byline");
 
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
index 4a74c0afd5..0db9290824 100644
--- a/lib/services/project-service.ts
+++ b/lib/services/project-service.ts
@@ -1,7 +1,7 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-import constants = require("../constants");
+import * as constants from "../constants";
 import * as osenv from "osenv";
 import * as path from "path";
 import * as shell from "shelljs";
diff --git a/lib/services/user-settings-service.ts b/lib/services/user-settings-service.ts
index 49aef050d8..af410244c4 100644
--- a/lib/services/user-settings-service.ts
+++ b/lib/services/user-settings-service.ts
@@ -1,8 +1,8 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-import path = require("path");
-import userSettingsServiceBaseLib = require("../common/services/user-settings-service");
+import * as path from "path";
+import * as userSettingsServiceBaseLib from "../common/services/user-settings-service";
 
 class UserSettingsService extends userSettingsServiceBaseLib.UserSettingsServiceBase {
 	constructor($fs: IFileSystem,
diff --git a/lib/tools/broccoli/broccoli-plugin-wrapper-factory.ts b/lib/tools/broccoli/broccoli-plugin-wrapper-factory.ts
index af2a3ef40b..71026f1824 100644
--- a/lib/tools/broccoli/broccoli-plugin-wrapper-factory.ts
+++ b/lib/tools/broccoli/broccoli-plugin-wrapper-factory.ts
@@ -1,7 +1,7 @@
 ///<reference path="../../.d.ts"/>
 "use strict";
 
-import broccoliPluginWrapperLib = require("./broccoli-plugin-wrapper");
+import * as broccoliPluginWrapperLib from "./broccoli-plugin-wrapper";
 
 /**
  * Makes writing plugins easy.
diff --git a/lib/tools/broccoli/builder.ts b/lib/tools/broccoli/builder.ts
index 7b5f33e61d..fc0933ac19 100644
--- a/lib/tools/broccoli/builder.ts
+++ b/lib/tools/broccoli/builder.ts
@@ -4,7 +4,7 @@
 import * as constants from "../../../lib/constants";
 import * as path from "path";
 import Future = require("fibers/future");
-import destCopyLib = require("./node-modules-dest-copy");
+import * as destCopyLib from "./node-modules-dest-copy";
 
 let gulp = require("gulp");
 let vinylFilterSince = require("vinyl-filter-since");
diff --git a/lib/tools/broccoli/node-modules-dest-copy.ts b/lib/tools/broccoli/node-modules-dest-copy.ts
index 53646692a9..302e306498 100644
--- a/lib/tools/broccoli/node-modules-dest-copy.ts
+++ b/lib/tools/broccoli/node-modules-dest-copy.ts
@@ -1,12 +1,12 @@
 ///<reference path="../../.d.ts"/>
 "use strict";
 
-import fs = require("fs");
+import * as fs from "fs";
 import * as path from "path";
-import semver = require("semver");
+import * as semver from "semver";
 import * as shelljs from "shelljs";
 import {wrapBroccoliPlugin} from './broccoli-plugin-wrapper-factory';
-import constants = require("../../constants");
+import * as constants from "../../constants";
 
 /**
  * Intercepts each directory as it is copied to the destination tempdir,
diff --git a/test/android-project-properties-manager.ts b/test/android-project-properties-manager.ts
index 56a7e3b2d7..cb2fa63024 100644
--- a/test/android-project-properties-manager.ts
+++ b/test/android-project-properties-manager.ts
@@ -10,7 +10,7 @@ import * as ErrorsLib from "../lib/common/errors";
 import * as LoggerLib from "../lib/common/logger";
 import * as ConfigLib from "../lib/config";
 import * as OptionsLib from "../lib/options";
-import yok = require("../lib/common/yok");
+import * as yok from "../lib/common/yok";
 import * as path from "path";
 import temp = require("temp");
 temp.track();
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
index cef7b28d3c..d3023fdb45 100644
--- a/test/ios-project-service.ts
+++ b/test/ios-project-service.ts
@@ -3,22 +3,19 @@
 
 import Future = require("fibers/future");
 import * as path from "path";
+import * as ChildProcessLib from "../lib/common/child-process";
+import * as ConfigLib from "../lib/config";
+import * as ErrorsLib from "../lib/common/errors";
+import * as FileSystemLib from "../lib/common/file-system";
+import * as HostInfoLib from "../lib/common/host-info";
+import * as iOSProjectServiceLib from "../lib/services/ios-project-service";
+import * as LoggerLib from "../lib/common/logger";
+import * as OptionsLib from "../lib/options";
+import * as yok from "../lib/common/yok";
+import { assert } from "chai";
 import temp = require("temp");
 temp.track();
 
-import ChildProcessLib = require("../lib/common/child-process");
-import ConfigLib = require("../lib/config");
-import ErrorsLib = require("../lib/common/errors");
-import FileSystemLib = require("../lib/common/file-system");
-import HostInfoLib = require("../lib/common/host-info");
-import iOSProjectServiceLib = require("../lib/services/ios-project-service");
-import LoggerLib = require("../lib/common/logger");
-import OptionsLib = require("../lib/options");
-
-import yok = require("../lib/common/yok");
-
-import { assert } from "chai";
-
 function createTestInjector(projectPath: string, projectName: string): IInjector {
 	let testInjector = new yok.Yok();
 	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
diff --git a/test/npm-installation-manager.ts b/test/npm-installation-manager.ts
index 43bf7b55c1..dcda6ef26c 100644
--- a/test/npm-installation-manager.ts
+++ b/test/npm-installation-manager.ts
@@ -10,9 +10,8 @@ import * as LoggerLib from "../lib/common/logger";
 import * as NpmInstallationManagerLib from "../lib/npm-installation-manager";
 import * as OptionsLib from "../lib/options";
 import * as StaticConfigLib from "../lib/config";
-
 import Future = require("fibers/future");
-import yok = require("../lib/common/yok");
+import * as yok from "../lib/common/yok";
 
 function createTestInjector(): IInjector {
 	let testInjector = new yok.Yok();
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
index fc1b76aa9d..f4d1255cfd 100644
--- a/test/platform-commands.ts
+++ b/test/platform-commands.ts
@@ -1,8 +1,8 @@
 /// <reference path=".d.ts" />
 "use strict";
 
-import yok = require('../lib/common/yok');
-import stubs = require('./stubs');
+import * as yok from "../lib/common/yok";
+import * as stubs from "./stubs";
 import * as PlatformAddCommandLib from "../lib/commands/add-platform";
 import * as PlatformRemoveCommandLib from "../lib/commands/remove-platform";
 import * as PlatformUpdateCommandLib from "../lib/commands/update-platform";
diff --git a/test/platform-service.ts b/test/platform-service.ts
index 1dfaeffe4f..d8a0831d3f 100644
--- a/test/platform-service.ts
+++ b/test/platform-service.ts
@@ -1,14 +1,14 @@
 /// <reference path=".d.ts" />
 "use strict";
 
-import yok = require('../lib/common/yok');
-import stubs = require('./stubs');
-import PlatformServiceLib = require('../lib/services/platform-service');
-import StaticConfigLib = require("../lib/config");
-import fsLib = require("../lib/common/file-system");
-import optionsLib = require("../lib/options");
-import hostInfoLib = require("../lib/common/host-info");
-import ProjectFilesManagerLib = require("../lib/services/project-files-manager");
+import * as yok from "../lib/common/yok";
+import * as stubs from "./stubs";
+import * as PlatformServiceLib from "../lib/services/platform-service";
+import * as StaticConfigLib from "../lib/config";
+import * as fsLib from "../lib/common/file-system";
+import * as optionsLib from "../lib/options";
+import * as hostInfoLib from "../lib/common/host-info";
+import * as ProjectFilesManagerLib from "../lib/services/project-files-manager";
 import * as path from "path";
 import Future = require("fibers/future");
 import {assert} from "chai";
diff --git a/test/project-files-manager.ts b/test/project-files-manager.ts
index f859fb422b..bd94267299 100644
--- a/test/project-files-manager.ts
+++ b/test/project-files-manager.ts
@@ -1,18 +1,17 @@
 /// <reference path=".d.ts" />
 "use strict";
 
-import yok = require('../lib/common/yok');
-import fsLib = require("../lib/common/file-system");
-import projectFilesManagerLib = require("../lib/services/project-files-manager");
-import hostInfoLib = require("../lib/common/host-info");
-import StaticConfigLib = require("../lib/config");
-import ErrorsLib = require("../lib/common/errors");
+import * as yok from "../lib/common/yok";
+import * as fsLib from "../lib/common/file-system";
+import * as projectFilesManagerLib from "../lib/services/project-files-manager";
+import * as hostInfoLib from "../lib/common/host-info";
+import * as StaticConfigLib from "../lib/config";
+import * as ErrorsLib from "../lib/common/errors";
 import * as path from "path";
+let assert = require("chai").assert;
 import temp = require("temp");
 temp.track();
 
-let assert = require("chai").assert;
-
 function createTestInjector() {
 	let testInjector = new yok.Yok();
 	testInjector.register("fs", fsLib.FileSystem);
diff --git a/test/project-service.ts b/test/project-service.ts
index 9a4dc00b62..5ecc2bce4a 100644
--- a/test/project-service.ts
+++ b/test/project-service.ts
@@ -1,8 +1,8 @@
 /// <reference path=".d.ts" />
 "use strict";
 
-import yok = require('../lib/common/yok');
-import stubs = require('./stubs');
+import * as yok from "../lib/common/yok";
+import * as stubs from "./stubs";
 import * as constants from "./../lib/constants";
 import {ChildProcess} from "../lib/common/child-process";
 import * as ProjectServiceLib from "../lib/services/project-service";