diff --git a/local-cli/commands.js b/local-cli/commands.js
index e696b35be1f..1bb6a31b63b 100644
--- a/local-cli/commands.js
+++ b/local-cli/commands.js
@@ -11,7 +11,7 @@
 'use strict';
 
 const Config = require('./util/Config');
-const getUserCommands = require('./rnpm/core/src/getCommands');
+const getUserCommands = require('./core/getCommands');
 
 export type Command = {
   name: string,
@@ -37,10 +37,10 @@ const documentedCommands = [
   require('./library/library'),
   require('./bundle/bundle'),
   require('./bundle/unbundle'),
-  require('./rnpm/link/link'),
-  require('./rnpm/link/unlink'),
-  require('./rnpm/install/install'),
-  require('./rnpm/install/uninstall'),
+  require('./link/link'),
+  require('./link/unlink'),
+  require('./install/install'),
+  require('./install/uninstall'),
   require('./upgrade/upgrade'),
   require('./logAndroid/logAndroid'),
   require('./logIOS/logIOS'),
diff --git a/local-cli/rnpm/core/__fixtures__/android.js b/local-cli/core/__fixtures__/android.js
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/android.js
rename to local-cli/core/__fixtures__/android.js
diff --git a/local-cli/rnpm/core/__fixtures__/commands.js b/local-cli/core/__fixtures__/commands.js
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/commands.js
rename to local-cli/core/__fixtures__/commands.js
diff --git a/local-cli/rnpm/core/__fixtures__/dependencies.js b/local-cli/core/__fixtures__/dependencies.js
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/dependencies.js
rename to local-cli/core/__fixtures__/dependencies.js
diff --git a/local-cli/rnpm/core/__fixtures__/files/AndroidManifest.xml b/local-cli/core/__fixtures__/files/AndroidManifest.xml
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/files/AndroidManifest.xml
rename to local-cli/core/__fixtures__/files/AndroidManifest.xml
diff --git a/local-cli/rnpm/core/__fixtures__/files/Main.java b/local-cli/core/__fixtures__/files/Main.java
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/files/Main.java
rename to local-cli/core/__fixtures__/files/Main.java
diff --git a/local-cli/rnpm/core/__fixtures__/files/ReactPackage.java b/local-cli/core/__fixtures__/files/ReactPackage.java
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/files/ReactPackage.java
rename to local-cli/core/__fixtures__/files/ReactPackage.java
diff --git a/local-cli/rnpm/core/__fixtures__/files/package.json b/local-cli/core/__fixtures__/files/package.json
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/files/package.json
rename to local-cli/core/__fixtures__/files/package.json
diff --git a/local-cli/rnpm/core/__fixtures__/files/project.pbxproj b/local-cli/core/__fixtures__/files/project.pbxproj
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/files/project.pbxproj
rename to local-cli/core/__fixtures__/files/project.pbxproj
diff --git a/local-cli/rnpm/core/__fixtures__/ios.js b/local-cli/core/__fixtures__/ios.js
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/ios.js
rename to local-cli/core/__fixtures__/ios.js
diff --git a/local-cli/rnpm/core/__fixtures__/projects.js b/local-cli/core/__fixtures__/projects.js
similarity index 100%
rename from local-cli/rnpm/core/__fixtures__/projects.js
rename to local-cli/core/__fixtures__/projects.js
diff --git a/local-cli/rnpm/core/__tests__/android/findAndroidAppFolder.spec.js b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
similarity index 89%
rename from local-cli/rnpm/core/__tests__/android/findAndroidAppFolder.spec.js
rename to local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
index 3aa2806e684..753ffbf6b7f 100644
--- a/local-cli/rnpm/core/__tests__/android/findAndroidAppFolder.spec.js
+++ b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const findAndroidAppFolder = require('../../src/config/android/findAndroidAppFolder');
+const findAndroidAppFolder = require('../../config/android/findAndroidAppFolder');
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 
diff --git a/local-cli/rnpm/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest.spec.js
similarity index 88%
rename from local-cli/rnpm/core/__tests__/android/findManifest.spec.js
rename to local-cli/core/__tests__/android/findManifest.spec.js
index ca388fa399f..45c2b996af3 100644
--- a/local-cli/rnpm/core/__tests__/android/findManifest.spec.js
+++ b/local-cli/core/__tests__/android/findManifest.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const findManifest = require('../../src/config/android/findManifest');
+const findManifest = require('../../config/android/findManifest');
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 
diff --git a/local-cli/rnpm/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName.spec.js
similarity index 86%
rename from local-cli/rnpm/core/__tests__/android/findPackageClassName.spec.js
rename to local-cli/core/__tests__/android/findPackageClassName.spec.js
index 3ee3dd2d5bf..f1d4ae08af2 100644
--- a/local-cli/rnpm/core/__tests__/android/findPackageClassName.spec.js
+++ b/local-cli/core/__tests__/android/findPackageClassName.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const findPackageClassName = require('../../src/config/android/findPackageClassName');
+const findPackageClassName = require('../../config/android/findPackageClassName');
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 
diff --git a/local-cli/rnpm/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
similarity index 94%
rename from local-cli/rnpm/core/__tests__/android/getDependencyConfig.spec.js
rename to local-cli/core/__tests__/android/getDependencyConfig.spec.js
index 67065a002aa..82c51281b16 100644
--- a/local-cli/rnpm/core/__tests__/android/getDependencyConfig.spec.js
+++ b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const getDependencyConfig = require('../../src/config/android').dependencyConfig;
+const getDependencyConfig = require('../../config/android').dependencyConfig;
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 const userConfig = {};
diff --git a/local-cli/rnpm/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js
similarity index 94%
rename from local-cli/rnpm/core/__tests__/android/getProjectConfig.spec.js
rename to local-cli/core/__tests__/android/getProjectConfig.spec.js
index f445f5061b6..f5d54382cd7 100644
--- a/local-cli/rnpm/core/__tests__/android/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/android/getProjectConfig.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const getProjectConfig = require('../../src/config/android').projectConfig;
+const getProjectConfig = require('../../config/android').projectConfig;
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 
diff --git a/local-cli/rnpm/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest.spec.js
similarity index 84%
rename from local-cli/rnpm/core/__tests__/android/readManifest.spec.js
rename to local-cli/core/__tests__/android/readManifest.spec.js
index 0c96a4cb152..cf18f8c148a 100644
--- a/local-cli/rnpm/core/__tests__/android/readManifest.spec.js
+++ b/local-cli/core/__tests__/android/readManifest.spec.js
@@ -1,7 +1,7 @@
 jest.autoMockOff();
 
-const findManifest = require('../../src/config/android/findManifest');
-const readManifest = require('../../src/config/android/readManifest');
+const findManifest = require('../../config/android/findManifest');
+const readManifest = require('../../config/android/readManifest');
 const mockFs = require('mock-fs');
 const mocks = require('../../__fixtures__/android');
 
diff --git a/local-cli/rnpm/core/__tests__/findAssets.spec.js b/local-cli/core/__tests__/findAssets.spec.js
similarity index 94%
rename from local-cli/rnpm/core/__tests__/findAssets.spec.js
rename to local-cli/core/__tests__/findAssets.spec.js
index bb712aa32aa..7bbe8986765 100644
--- a/local-cli/rnpm/core/__tests__/findAssets.spec.js
+++ b/local-cli/core/__tests__/findAssets.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const findAssets = require('../src/config/findAssets');
+const findAssets = require('../config/findAssets');
 const mockFs = require('mock-fs');
 const dependencies = require('../__fixtures__/dependencies');
 const isArray = (arg) =>
diff --git a/local-cli/rnpm/core/__tests__/findPlugins.spec.js b/local-cli/core/__tests__/findPlugins.spec.js
similarity index 96%
rename from local-cli/rnpm/core/__tests__/findPlugins.spec.js
rename to local-cli/core/__tests__/findPlugins.spec.js
index c7285687357..c25ab77c1b2 100644
--- a/local-cli/rnpm/core/__tests__/findPlugins.spec.js
+++ b/local-cli/core/__tests__/findPlugins.spec.js
@@ -1,7 +1,7 @@
 jest.autoMockOff();
 
 const path = require('path');
-const findPlugins = require('../src/findPlugins');
+const findPlugins = require('../findPlugins');
 
 const pjsonPath = path.join(process.cwd(), 'package.json');
 const isArray = (arg) =>
diff --git a/local-cli/rnpm/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject.spec.js
similarity index 97%
rename from local-cli/rnpm/core/__tests__/ios/findProject.spec.js
rename to local-cli/core/__tests__/ios/findProject.spec.js
index a1c0801d254..08a931e016b 100644
--- a/local-cli/rnpm/core/__tests__/ios/findProject.spec.js
+++ b/local-cli/core/__tests__/ios/findProject.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const findProject = require('../../src/config/ios/findProject');
+const findProject = require('../../config/ios/findProject');
 const mockFs = require('mock-fs');
 const projects = require('../../__fixtures__/projects');
 const ios = require('../../__fixtures__/ios');
diff --git a/local-cli/rnpm/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
similarity index 93%
rename from local-cli/rnpm/core/__tests__/ios/getProjectConfig.spec.js
rename to local-cli/core/__tests__/ios/getProjectConfig.spec.js
index 5536de3287b..9b1a88e756a 100644
--- a/local-cli/rnpm/core/__tests__/ios/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
@@ -1,6 +1,6 @@
 jest.autoMockOff();
 
-const getProjectConfig = require('../../src/config/ios').projectConfig;
+const getProjectConfig = require('../../config/ios').projectConfig;
 const mockFs = require('mock-fs');
 const projects = require('../../__fixtures__/projects');
 
diff --git a/local-cli/rnpm/core/__tests__/makeCommand.spec.js b/local-cli/core/__tests__/makeCommand.spec.js
similarity index 89%
rename from local-cli/rnpm/core/__tests__/makeCommand.spec.js
rename to local-cli/core/__tests__/makeCommand.spec.js
index 1fb50dfe662..b0f643fb989 100644
--- a/local-cli/rnpm/core/__tests__/makeCommand.spec.js
+++ b/local-cli/core/__tests__/makeCommand.spec.js
@@ -5,9 +5,9 @@ jest.setMock('child_process', {
     on: (ev, cb) => cb(spawnError),
   }),
 });
-jest.dontMock('../src/makeCommand');
+jest.dontMock('../makeCommand');
 
-const makeCommand = require('../src/makeCommand');
+const makeCommand = require('../makeCommand');
 
 describe('makeCommand', () => {
   const command = makeCommand('echo');
diff --git a/local-cli/rnpm/core/src/config/android/findAndroidAppFolder.js b/local-cli/core/config/android/findAndroidAppFolder.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/android/findAndroidAppFolder.js
rename to local-cli/core/config/android/findAndroidAppFolder.js
diff --git a/local-cli/rnpm/core/src/config/android/findManifest.js b/local-cli/core/config/android/findManifest.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/android/findManifest.js
rename to local-cli/core/config/android/findManifest.js
diff --git a/local-cli/rnpm/core/src/config/android/findPackageClassName.js b/local-cli/core/config/android/findPackageClassName.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/android/findPackageClassName.js
rename to local-cli/core/config/android/findPackageClassName.js
diff --git a/local-cli/rnpm/core/src/config/android/index.js b/local-cli/core/config/android/index.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/android/index.js
rename to local-cli/core/config/android/index.js
diff --git a/local-cli/rnpm/core/src/config/android/readManifest.js b/local-cli/core/config/android/readManifest.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/android/readManifest.js
rename to local-cli/core/config/android/readManifest.js
diff --git a/local-cli/rnpm/core/src/config/findAssets.js b/local-cli/core/config/findAssets.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/findAssets.js
rename to local-cli/core/config/findAssets.js
diff --git a/local-cli/rnpm/core/src/config/index.js b/local-cli/core/config/index.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/index.js
rename to local-cli/core/config/index.js
diff --git a/local-cli/rnpm/core/src/config/ios/findProject.js b/local-cli/core/config/ios/findProject.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/ios/findProject.js
rename to local-cli/core/config/ios/findProject.js
diff --git a/local-cli/rnpm/core/src/config/ios/index.js b/local-cli/core/config/ios/index.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/ios/index.js
rename to local-cli/core/config/ios/index.js
diff --git a/local-cli/rnpm/core/src/config/wrapCommands.js b/local-cli/core/config/wrapCommands.js
similarity index 100%
rename from local-cli/rnpm/core/src/config/wrapCommands.js
rename to local-cli/core/config/wrapCommands.js
diff --git a/local-cli/rnpm/core/src/findPlugins.js b/local-cli/core/findPlugins.js
similarity index 100%
rename from local-cli/rnpm/core/src/findPlugins.js
rename to local-cli/core/findPlugins.js
diff --git a/local-cli/rnpm/core/src/getCommands.js b/local-cli/core/getCommands.js
similarity index 100%
rename from local-cli/rnpm/core/src/getCommands.js
rename to local-cli/core/getCommands.js
diff --git a/local-cli/rnpm/core/src/makeCommand.js b/local-cli/core/makeCommand.js
similarity index 100%
rename from local-cli/rnpm/core/src/makeCommand.js
rename to local-cli/core/makeCommand.js
diff --git a/local-cli/default.config.js b/local-cli/default.config.js
index 7ba61f7edd9..b9757e9aae2 100644
--- a/local-cli/default.config.js
+++ b/local-cli/default.config.js
@@ -2,7 +2,7 @@
 
 var blacklist = require('../packager/blacklist');
 var path = require('path');
-var rnpmConfig = require('./rnpm/core/src/config');
+var rnpmConfig = require('./core/config');
 
 /**
  * Default configuration for the CLI.
diff --git a/local-cli/rnpm/install/src/install.js b/local-cli/install/install.js
similarity index 76%
rename from local-cli/rnpm/install/src/install.js
rename to local-cli/install/install.js
index 77d6bd42768..c7d8f15996f 100644
--- a/local-cli/rnpm/install/src/install.js
+++ b/local-cli/install/install.js
@@ -7,7 +7,7 @@ const spawnOpts = {
 
 log.heading = 'rnpm-install';
 
-module.exports = function install(args, config) {
+function install(args, config) {
   const name = args[0];
 
   var res = spawnSync('npm', ['install', name, '--save'], spawnOpts);
@@ -24,3 +24,9 @@ module.exports = function install(args, config) {
 
   log.info(`Module ${name} has been successfully installed & linked`);
 };
+
+module.exports = {
+  func: install,
+  description: 'install and link native dependencies',
+  name: 'install <packageName>',
+};
diff --git a/local-cli/rnpm/install/src/uninstall.js b/local-cli/install/uninstall.js
similarity index 75%
rename from local-cli/rnpm/install/src/uninstall.js
rename to local-cli/install/uninstall.js
index ff6b41f1c94..b78ca64b62d 100644
--- a/local-cli/rnpm/install/src/uninstall.js
+++ b/local-cli/install/uninstall.js
@@ -7,7 +7,7 @@ const spawnOpts = {
 
 log.heading = 'rnpm-install';
 
-module.exports = function install(args, config) {
+function uninstall(args, config) {
   const name = args[0];
 
   var res = spawnSync('rnpm', ['unlink', name], spawnOpts);
@@ -24,3 +24,9 @@ module.exports = function install(args, config) {
 
   log.info(`Module ${name} has been successfully uninstalled & unlinked`);
 };
+
+module.exports = {
+  func: uninstall,
+  description: 'uninstall and unlink native dependencies',
+  name: 'uninstall <packageName>',
+};
diff --git a/local-cli/rnpm/link/__fixtures__/android/0.17/MainActivity.java b/local-cli/link/__fixtures__/android/0.17/MainActivity.java
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/0.17/MainActivity.java
rename to local-cli/link/__fixtures__/android/0.17/MainActivity.java
diff --git a/local-cli/rnpm/link/__fixtures__/android/0.17/patchedMainActivity.java b/local-cli/link/__fixtures__/android/0.17/patchedMainActivity.java
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/0.17/patchedMainActivity.java
rename to local-cli/link/__fixtures__/android/0.17/patchedMainActivity.java
diff --git a/local-cli/rnpm/link/__fixtures__/android/0.18/MainActivity.java b/local-cli/link/__fixtures__/android/0.18/MainActivity.java
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/0.18/MainActivity.java
rename to local-cli/link/__fixtures__/android/0.18/MainActivity.java
diff --git a/local-cli/rnpm/link/__fixtures__/android/0.18/patchedMainActivity.java b/local-cli/link/__fixtures__/android/0.18/patchedMainActivity.java
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/0.18/patchedMainActivity.java
rename to local-cli/link/__fixtures__/android/0.18/patchedMainActivity.java
diff --git a/local-cli/rnpm/link/__fixtures__/android/0.20/MainActivity.java b/local-cli/link/__fixtures__/android/0.20/MainActivity.java
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/0.20/MainActivity.java
rename to local-cli/link/__fixtures__/android/0.20/MainActivity.java
diff --git a/local-cli/rnpm/link/__fixtures__/android/build.gradle b/local-cli/link/__fixtures__/android/build.gradle
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/build.gradle
rename to local-cli/link/__fixtures__/android/build.gradle
diff --git a/local-cli/rnpm/link/__fixtures__/android/patchedBuild.gradle b/local-cli/link/__fixtures__/android/patchedBuild.gradle
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/patchedBuild.gradle
rename to local-cli/link/__fixtures__/android/patchedBuild.gradle
diff --git a/local-cli/rnpm/link/__fixtures__/android/patchedSettings.gradle b/local-cli/link/__fixtures__/android/patchedSettings.gradle
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/patchedSettings.gradle
rename to local-cli/link/__fixtures__/android/patchedSettings.gradle
diff --git a/local-cli/rnpm/link/__fixtures__/android/settings.gradle b/local-cli/link/__fixtures__/android/settings.gradle
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/android/settings.gradle
rename to local-cli/link/__fixtures__/android/settings.gradle
diff --git a/local-cli/rnpm/link/__fixtures__/linearGradient.pbxproj b/local-cli/link/__fixtures__/linearGradient.pbxproj
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/linearGradient.pbxproj
rename to local-cli/link/__fixtures__/linearGradient.pbxproj
diff --git a/local-cli/rnpm/link/__fixtures__/project.pbxproj b/local-cli/link/__fixtures__/project.pbxproj
similarity index 100%
rename from local-cli/rnpm/link/__fixtures__/project.pbxproj
rename to local-cli/link/__fixtures__/project.pbxproj
diff --git a/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js b/local-cli/link/__tests__/android/applyPatch.spec.js
similarity index 91%
rename from local-cli/rnpm/link/__tests__/android/applyPatch.spec.js
rename to local-cli/link/__tests__/android/applyPatch.spec.js
index 0994b24aea4..19ce76b4b7b 100644
--- a/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js
+++ b/local-cli/link/__tests__/android/applyPatch.spec.js
@@ -11,7 +11,7 @@
 
 jest.autoMockOff();
 
-const applyParams = require('../../src/android/patches/applyParams');
+const applyParams = require('../../android/patches/applyParams');
 
 describe('applyParams', () => {
   it('apply params to the string', () => {
diff --git a/local-cli/rnpm/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled.spec.js
similarity index 89%
rename from local-cli/rnpm/link/__tests__/android/isInstalled.spec.js
rename to local-cli/link/__tests__/android/isInstalled.spec.js
index 56befa52bf8..767925d1169 100644
--- a/local-cli/rnpm/link/__tests__/android/isInstalled.spec.js
+++ b/local-cli/link/__tests__/android/isInstalled.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const path = require('path');
-const isInstalled = require('../../src/android/isInstalled');
+const isInstalled = require('../../android/isInstalled');
 
 const projectConfig = {
   buildGradlePath: path.join(__dirname, '../../__fixtures__/android/patchedBuild.gradle'),
diff --git a/local-cli/rnpm/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
similarity index 83%
rename from local-cli/rnpm/link/__tests__/android/makeBuildPatch.spec.js
rename to local-cli/link/__tests__/android/makeBuildPatch.spec.js
index e20e2b59296..7a8745df580 100644
--- a/local-cli/rnpm/link/__tests__/android/makeBuildPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const makeBuildPatch = require('../../src/android/patches/makeBuildPatch');
+const makeBuildPatch = require('../../android/patches/makeBuildPatch');
 const name = 'test';
 
 describe('makeBuildPatch', () => {
diff --git a/local-cli/rnpm/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch.spec.js
similarity index 85%
rename from local-cli/rnpm/link/__tests__/android/makeImportPatch.spec.js
rename to local-cli/link/__tests__/android/makeImportPatch.spec.js
index 6ee21406855..d8a6020cfb2 100644
--- a/local-cli/rnpm/link/__tests__/android/makeImportPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeImportPatch.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const makeImportPatch = require('../../src/android/patches/makeImportPatch');
+const makeImportPatch = require('../../android/patches/makeImportPatch');
 
 const packageImportPath = 'import some.example.project';
 
diff --git a/local-cli/rnpm/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch.spec.js
similarity index 82%
rename from local-cli/rnpm/link/__tests__/android/makePackagePatch.spec.js
rename to local-cli/link/__tests__/android/makePackagePatch.spec.js
index 2a87848ff58..16b5a86b965 100644
--- a/local-cli/rnpm/link/__tests__/android/makePackagePatch.spec.js
+++ b/local-cli/link/__tests__/android/makePackagePatch.spec.js
@@ -2,8 +2,8 @@
 
 jest.autoMockOff();
 
-const makePackagePatch = require('../../src/android/patches/makePackagePatch');
-const applyParams = require('../../src/android/patches/applyParams');
+const makePackagePatch = require('../../android/patches/makePackagePatch');
+const applyParams = require('../../android/patches/applyParams');
 
 const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')';
 const name = 'some-library';
diff --git a/local-cli/rnpm/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
similarity index 92%
rename from local-cli/rnpm/link/__tests__/android/makeSettingsPatch.spec.js
rename to local-cli/link/__tests__/android/makeSettingsPatch.spec.js
index ca3b303e968..55153e75d15 100644
--- a/local-cli/rnpm/link/__tests__/android/makeSettingsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const path = require('path');
-const makeSettingsPatch = require('../../src/android/patches/makeSettingsPatch');
+const makeSettingsPatch = require('../../android/patches/makeSettingsPatch');
 
 const name = 'test';
 const projectConfig = {
diff --git a/local-cli/rnpm/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig.spec.js
similarity index 90%
rename from local-cli/rnpm/link/__tests__/getDependencyConfig.spec.js
rename to local-cli/link/__tests__/getDependencyConfig.spec.js
index eeb2bfa437b..48ee731e434 100644
--- a/local-cli/rnpm/link/__tests__/getDependencyConfig.spec.js
+++ b/local-cli/link/__tests__/getDependencyConfig.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const getDependencyConfig = require('../src/getDependencyConfig');
+const getDependencyConfig = require('../getDependencyConfig');
 const sinon = require('sinon');
 
 describe('getDependencyConfig', () => {
diff --git a/local-cli/rnpm/link/__tests__/getProjectDependencies.spec.js b/local-cli/link/__tests__/getProjectDependencies.spec.js
similarity index 88%
rename from local-cli/rnpm/link/__tests__/getProjectDependencies.spec.js
rename to local-cli/link/__tests__/getProjectDependencies.spec.js
index 2edd173619e..6db4cac01c3 100644
--- a/local-cli/rnpm/link/__tests__/getProjectDependencies.spec.js
+++ b/local-cli/link/__tests__/getProjectDependencies.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const getProjectDependencies = require('../src/getProjectDependencies');
+const getProjectDependencies = require('../getProjectDependencies');
 const path = require('path');
 
 describe('getProjectDependencies', () => {
diff --git a/local-cli/rnpm/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType.spec.js
similarity index 87%
rename from local-cli/rnpm/link/__tests__/groupFilesByType.spec.js
rename to local-cli/link/__tests__/groupFilesByType.spec.js
index 805851da407..304ee8ec1a6 100644
--- a/local-cli/rnpm/link/__tests__/groupFilesByType.spec.js
+++ b/local-cli/link/__tests__/groupFilesByType.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const groupFilesByType = require('../src/groupFilesByType');
+const groupFilesByType = require('../groupFilesByType');
 
 describe('groupFilesByType', () => {
 
diff --git a/local-cli/rnpm/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject.spec.js
similarity index 89%
rename from local-cli/rnpm/link/__tests__/ios/addFileToProject.spec.js
rename to local-cli/link/__tests__/ios/addFileToProject.spec.js
index a591394b317..d1a5a75a6d0 100644
--- a/local-cli/rnpm/link/__tests__/ios/addFileToProject.spec.js
+++ b/local-cli/link/__tests__/ios/addFileToProject.spec.js
@@ -4,7 +4,7 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const path = require('path');
-const addFileToProject = require('../../src/ios/addFileToProject');
+const addFileToProject = require('../../ios/addFileToProject');
 const _ = require('lodash');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/addProjectToLibraries.spec.js b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
similarity index 90%
rename from local-cli/rnpm/link/__tests__/ios/addProjectToLibraries.spec.js
rename to local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
index 40673e4438c..ebcdb411bca 100644
--- a/local-cli/rnpm/link/__tests__/ios/addProjectToLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
@@ -5,7 +5,7 @@ jest.autoMockOff();
 const xcode = require('xcode');
 const path = require('path');
 const PbxFile = require('xcode/lib/pbxFile');
-const addProjectToLibraries = require('../../src/ios/addProjectToLibraries');
+const addProjectToLibraries = require('../../ios/addProjectToLibraries');
 const last = require('lodash').last;
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
similarity index 90%
rename from local-cli/rnpm/link/__tests__/ios/addSharedLibraries.spec.js
rename to local-cli/link/__tests__/ios/addSharedLibraries.spec.js
index f407fd98022..daecdd9141a 100644
--- a/local-cli/rnpm/link/__tests__/ios/addSharedLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
@@ -4,8 +4,8 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const path = require('path');
-const addSharedLibraries = require('../../src/ios/addSharedLibraries');
-const getGroup = require('../../src/ios/getGroup');
+const addSharedLibraries = require('../../ios/addSharedLibraries');
+const getGroup = require('../../ios/getGroup');
 
 const project = xcode.project(
   path.join(__dirname, '../../__fixtures__/project.pbxproj')
diff --git a/local-cli/rnpm/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup.spec.js
similarity index 93%
rename from local-cli/rnpm/link/__tests__/ios/createGroup.spec.js
rename to local-cli/link/__tests__/ios/createGroup.spec.js
index 2e95c8f1865..037c866e6a3 100644
--- a/local-cli/rnpm/link/__tests__/ios/createGroup.spec.js
+++ b/local-cli/link/__tests__/ios/createGroup.spec.js
@@ -4,8 +4,8 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const path = require('path');
-const createGroup = require('../../src/ios/createGroup');
-const getGroup = require('../../src/ios/getGroup');
+const createGroup = require('../../ios/createGroup');
+const getGroup = require('../../ios/getGroup');
 const last = require('lodash').last;
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
similarity index 87%
rename from local-cli/rnpm/link/__tests__/ios/getBuildProperty.spec.js
rename to local-cli/link/__tests__/ios/getBuildProperty.spec.js
index e913758312d..77772b00fee 100644
--- a/local-cli/rnpm/link/__tests__/ios/getBuildProperty.spec.js
+++ b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
@@ -4,7 +4,7 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const path = require('path');
-const getBuildProperty = require('../../src/ios/getBuildProperty');
+const getBuildProperty = require('../../ios/getBuildProperty');
 
 const project = xcode.project(
   path.join(__dirname, '../../__fixtures__/project.pbxproj')
diff --git a/local-cli/rnpm/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup.spec.js
similarity index 95%
rename from local-cli/rnpm/link/__tests__/ios/getGroup.spec.js
rename to local-cli/link/__tests__/ios/getGroup.spec.js
index 6d1b770dc0e..21e1ec5af41 100644
--- a/local-cli/rnpm/link/__tests__/ios/getGroup.spec.js
+++ b/local-cli/link/__tests__/ios/getGroup.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const getGroup = require('../../src/ios/getGroup');
+const getGroup = require('../../ios/getGroup');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
similarity index 96%
rename from local-cli/rnpm/link/__tests__/ios/getHeaderSearchPath.spec.js
rename to local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
index bcf3b8e4a0d..142d387c41b 100644
--- a/local-cli/rnpm/link/__tests__/ios/getHeaderSearchPath.spec.js
+++ b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const getHeaderSearchPath = require('../../src/ios/getHeaderSearchPath');
+const getHeaderSearchPath = require('../../ios/getHeaderSearchPath');
 const path = require('path');
 
 const SRC_DIR = path.join('react-native-project', 'ios');
diff --git a/local-cli/rnpm/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
similarity index 91%
rename from local-cli/rnpm/link/__tests__/ios/getHeadersInFolder.spec.js
rename to local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
index 206f9f50cc9..30363d68780 100644
--- a/local-cli/rnpm/link/__tests__/ios/getHeadersInFolder.spec.js
+++ b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
@@ -2,7 +2,7 @@
 
 jest.autoMockOff();
 
-const getHeadersInFolder = require('../../src/ios/getHeadersInFolder');
+const getHeadersInFolder = require('../../ios/getHeadersInFolder');
 
 describe('ios::getHeadersInFolder', () => {
   xit('should return an array of all headers in given folder', () => {
diff --git a/local-cli/rnpm/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist.spec.js
similarity index 90%
rename from local-cli/rnpm/link/__tests__/ios/getPlist.spec.js
rename to local-cli/link/__tests__/ios/getPlist.spec.js
index d222b3f4757..2c7921d4b79 100644
--- a/local-cli/rnpm/link/__tests__/ios/getPlist.spec.js
+++ b/local-cli/link/__tests__/ios/getPlist.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const getPlist = require('../../src/ios/getPlist');
+const getPlist = require('../../ios/getPlist');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath.spec.js
similarity index 88%
rename from local-cli/rnpm/link/__tests__/ios/getPlistPath.spec.js
rename to local-cli/link/__tests__/ios/getPlistPath.spec.js
index 4b21b484e7c..e5cd111bf46 100644
--- a/local-cli/rnpm/link/__tests__/ios/getPlistPath.spec.js
+++ b/local-cli/link/__tests__/ios/getPlistPath.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const getPlistPath = require('../../src/ios/getPlistPath');
+const getPlistPath = require('../../ios/getPlistPath');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/getProducts.spec.js b/local-cli/link/__tests__/ios/getProducts.spec.js
similarity index 89%
rename from local-cli/rnpm/link/__tests__/ios/getProducts.spec.js
rename to local-cli/link/__tests__/ios/getProducts.spec.js
index 6ec8daba695..6d22fac85ee 100644
--- a/local-cli/rnpm/link/__tests__/ios/getProducts.spec.js
+++ b/local-cli/link/__tests__/ios/getProducts.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const getProducts = require('../../src/ios/getProducts');
+const getProducts = require('../../ios/getProducts');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
similarity index 90%
rename from local-cli/rnpm/link/__tests__/ios/hasLibraryImported.spec.js
rename to local-cli/link/__tests__/ios/hasLibraryImported.spec.js
index 77f1657cf03..2b3ac8f23cd 100644
--- a/local-cli/rnpm/link/__tests__/ios/hasLibraryImported.spec.js
+++ b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const hasLibraryImported = require('../../src/ios/hasLibraryImported');
+const hasLibraryImported = require('../../ios/hasLibraryImported');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled.spec.js
similarity index 94%
rename from local-cli/rnpm/link/__tests__/ios/isInstalled.spec.js
rename to local-cli/link/__tests__/ios/isInstalled.spec.js
index ae3651f0256..2a696fd1ac3 100644
--- a/local-cli/rnpm/link/__tests__/ios/isInstalled.spec.js
+++ b/local-cli/link/__tests__/ios/isInstalled.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const path = require('path');
-const isInstalled = require('../../src/ios/isInstalled');
+const isInstalled = require('../../ios/isInstalled');
 
 const baseProjectConfig = {
   pbxprojPath: path.join(__dirname, '../../__fixtures__/project.pbxproj'),
diff --git a/local-cli/rnpm/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
similarity index 88%
rename from local-cli/rnpm/link/__tests__/ios/mapHeaderSearchPaths.spec.js
rename to local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
index 4bc1a7d24d6..2db5e08caef 100644
--- a/local-cli/rnpm/link/__tests__/ios/mapHeaderSearchPaths.spec.js
+++ b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const xcode = require('xcode');
-const mapHeaderSearchPaths = require('../../src/ios/mapHeaderSearchPaths');
+const mapHeaderSearchPaths = require('../../ios/mapHeaderSearchPaths');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
similarity index 82%
rename from local-cli/rnpm/link/__tests__/ios/removeProjectFromLibraries.js
rename to local-cli/link/__tests__/ios/removeProjectFromLibraries.js
index 8c0d728ebee..b40464ff749 100644
--- a/local-cli/rnpm/link/__tests__/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
@@ -4,8 +4,8 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const PbxFile = require('xcode/lib/pbxFile');
-const addProjectToLibraries = require('../../src/ios/addProjectToLibraries');
-const removeProjectFromLibraries = require('../../src/ios/removeProjectFromLibraries');
+const addProjectToLibraries = require('../../ios/addProjectToLibraries');
+const removeProjectFromLibraries = require('../../ios/removeProjectFromLibraries');
 const last = require('lodash').last;
 const path = require('path');
 
diff --git a/local-cli/rnpm/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
similarity index 86%
rename from local-cli/rnpm/link/__tests__/ios/removeProjectFromProject.spec.js
rename to local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
index 0201d8824ef..7da0bb16c8a 100644
--- a/local-cli/rnpm/link/__tests__/ios/removeProjectFromProject.spec.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
@@ -4,8 +4,8 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const pbxFile = require('xcode/lib/pbxFile');
-const addFileToProject = require('../../src/ios/addFileToProject');
-const removeProjectFromProject = require('../../src/ios/removeProjectFromProject');
+const addFileToProject = require('../../ios/addFileToProject');
+const removeProjectFromProject = require('../../ios/removeProjectFromProject');
 const path = require('path');
 
 const project = xcode.project(
diff --git a/local-cli/rnpm/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
similarity index 81%
rename from local-cli/rnpm/link/__tests__/ios/removeSharedLibrary.spec.js
rename to local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
index 53aeb9be12d..408dbb22a30 100644
--- a/local-cli/rnpm/link/__tests__/ios/removeSharedLibrary.spec.js
+++ b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
@@ -4,9 +4,9 @@ jest.autoMockOff();
 
 const xcode = require('xcode');
 const path = require('path');
-const addSharedLibraries = require('../../src/ios/addSharedLibraries');
-const removeSharedLibraries = require('../../src/ios/removeSharedLibraries');
-const getGroup = require('../../src/ios/getGroup');
+const addSharedLibraries = require('../../ios/addSharedLibraries');
+const removeSharedLibraries = require('../../ios/removeSharedLibraries');
+const getGroup = require('../../ios/getGroup');
 
 const project = xcode.project(
   path.join(__dirname, '../../__fixtures__/project.pbxproj')
diff --git a/local-cli/rnpm/link/__tests__/link.spec.js b/local-cli/link/__tests__/link.spec.js
similarity index 84%
rename from local-cli/rnpm/link/__tests__/link.spec.js
rename to local-cli/link/__tests__/link.spec.js
index e6f5754a746..0b697a8e8af 100644
--- a/local-cli/rnpm/link/__tests__/link.spec.js
+++ b/local-cli/link/__tests__/link.spec.js
@@ -8,7 +8,7 @@ const path = require('path');
 
 describe('link', () => {
   beforeEach(() => {
-    delete require.cache[require.resolve('../src/link')];
+    delete require.cache[require.resolve('../link')];
     log.level = 'silent';
   });
 
@@ -19,7 +19,7 @@ describe('link', () => {
       },
     };
 
-    const link = require('../src/link');
+    const link = require('../link').func;
     link([], config).catch(() => done());
   });
 
@@ -29,7 +29,7 @@ describe('link', () => {
       getDependencyConfig: sinon.stub().returns({ assets: [], commands: {} }),
     };
 
-    const link = require('../src/link');
+    const link = require('../link').func;
     link(['react-native-gradient'], config).then(() => {
       expect(
         config.getDependencyConfig.calledWith('react-native-gradient')
@@ -53,7 +53,7 @@ describe('link', () => {
       }
     );
 
-    const link = require('../src/link');
+    const link = require('../link').func;
     link([], config).then(() => {
       expect(
         config.getDependencyConfig.calledWith('react-native-test')
@@ -71,26 +71,26 @@ describe('link', () => {
     };
 
     jest.setMock(
-      '../src/android/isInstalled.js',
+      '../android/isInstalled.js',
       sinon.stub().returns(false)
     );
 
     jest.setMock(
-      '../src/android/registerNativeModule.js',
+      '../android/registerNativeModule.js',
       registerNativeModule
     );
 
     jest.setMock(
-      '../src/ios/isInstalled.js',
+      '../ios/isInstalled.js',
       sinon.stub().returns(false)
     );
 
     jest.setMock(
-      '../src/ios/registerNativeModule.js',
+      '../ios/registerNativeModule.js',
       registerNativeModule
     );
 
-    const link = require('../src/link');
+    const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
       expect(registerNativeModule.calledTwice).toBeTruthy();
@@ -107,26 +107,26 @@ describe('link', () => {
     };
 
     jest.setMock(
-      '../src/ios/isInstalled.js',
+      '../ios/isInstalled.js',
       sinon.stub().returns(true)
     );
 
     jest.setMock(
-      '../src/android/isInstalled.js',
+      '../android/isInstalled.js',
       sinon.stub().returns(true)
     );
 
     jest.setMock(
-      '../src/ios/registerNativeModule.js',
+      '../ios/registerNativeModule.js',
       registerNativeModule
     );
 
     jest.setMock(
-      '../src/android/registerNativeModule.js',
+      '../android/registerNativeModule.js',
       registerNativeModule
     );
 
-    const link = require('../src/link');
+    const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
       expect(registerNativeModule.callCount).toEqual(0);
@@ -140,12 +140,12 @@ describe('link', () => {
     const postlink = sinon.stub().yieldsAsync();
 
     jest.setMock(
-      '../src/ios/registerNativeModule.js',
+      '../ios/registerNativeModule.js',
       registerNativeModule
     );
 
     jest.setMock(
-      '../src/ios/isInstalled.js',
+      '../ios/isInstalled.js',
       sinon.stub().returns(false)
     );
 
@@ -156,7 +156,7 @@ describe('link', () => {
       }),
     };
 
-    const link = require('../src/link');
+    const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
       expect(prelink.calledBefore(registerNativeModule)).toBeTruthy();
@@ -172,7 +172,7 @@ describe('link', () => {
     const copyAssets = sinon.stub();
 
     jest.setMock(
-      '../src/ios/copyAssets.js',
+      '../ios/copyAssets.js',
       copyAssets
     );
 
@@ -181,7 +181,7 @@ describe('link', () => {
       getDependencyConfig: sinon.stub().returns(dependencyConfig),
     };
 
-    const link = require('../src/link');
+    const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
       expect(copyAssets.calledOnce).toBeTruthy();
diff --git a/local-cli/rnpm/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall.spec.js
similarity index 93%
rename from local-cli/rnpm/link/__tests__/promiseWaterfall.spec.js
rename to local-cli/link/__tests__/promiseWaterfall.spec.js
index e327b780eec..7b592bf34d5 100644
--- a/local-cli/rnpm/link/__tests__/promiseWaterfall.spec.js
+++ b/local-cli/link/__tests__/promiseWaterfall.spec.js
@@ -3,7 +3,7 @@
 jest.autoMockOff();
 
 const sinon = require('sinon');
-const promiseWaterfall = require('../src/promiseWaterfall');
+const promiseWaterfall = require('../promiseWaterfall');
 
 describe('promiseWaterfall', () => {
 
diff --git a/local-cli/rnpm/link/src/android/copyAssets.js b/local-cli/link/android/copyAssets.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/copyAssets.js
rename to local-cli/link/android/copyAssets.js
diff --git a/local-cli/rnpm/link/src/android/fs.js b/local-cli/link/android/fs.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/fs.js
rename to local-cli/link/android/fs.js
diff --git a/local-cli/rnpm/link/src/android/isInstalled.js b/local-cli/link/android/isInstalled.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/isInstalled.js
rename to local-cli/link/android/isInstalled.js
diff --git a/local-cli/rnpm/link/src/android/patches/applyParams.js b/local-cli/link/android/patches/applyParams.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/applyParams.js
rename to local-cli/link/android/patches/applyParams.js
diff --git a/local-cli/rnpm/link/src/android/patches/applyPatch.js b/local-cli/link/android/patches/applyPatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/applyPatch.js
rename to local-cli/link/android/patches/applyPatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/makeBuildPatch.js b/local-cli/link/android/patches/makeBuildPatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/makeBuildPatch.js
rename to local-cli/link/android/patches/makeBuildPatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/makeImportPatch.js b/local-cli/link/android/patches/makeImportPatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/makeImportPatch.js
rename to local-cli/link/android/patches/makeImportPatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/makePackagePatch.js b/local-cli/link/android/patches/makePackagePatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/makePackagePatch.js
rename to local-cli/link/android/patches/makePackagePatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/makeSettingsPatch.js b/local-cli/link/android/patches/makeSettingsPatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/makeSettingsPatch.js
rename to local-cli/link/android/patches/makeSettingsPatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/makeStringsPatch.js b/local-cli/link/android/patches/makeStringsPatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/makeStringsPatch.js
rename to local-cli/link/android/patches/makeStringsPatch.js
diff --git a/local-cli/rnpm/link/src/android/patches/revokePatch.js b/local-cli/link/android/patches/revokePatch.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/patches/revokePatch.js
rename to local-cli/link/android/patches/revokePatch.js
diff --git a/local-cli/rnpm/link/src/android/registerNativeModule.js b/local-cli/link/android/registerNativeModule.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/registerNativeModule.js
rename to local-cli/link/android/registerNativeModule.js
diff --git a/local-cli/rnpm/link/src/android/unlinkAssets.js b/local-cli/link/android/unlinkAssets.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/unlinkAssets.js
rename to local-cli/link/android/unlinkAssets.js
diff --git a/local-cli/rnpm/link/src/android/unregisterNativeModule.js b/local-cli/link/android/unregisterNativeModule.js
similarity index 100%
rename from local-cli/rnpm/link/src/android/unregisterNativeModule.js
rename to local-cli/link/android/unregisterNativeModule.js
diff --git a/local-cli/rnpm/link/src/getDependencyConfig.js b/local-cli/link/getDependencyConfig.js
similarity index 100%
rename from local-cli/rnpm/link/src/getDependencyConfig.js
rename to local-cli/link/getDependencyConfig.js
diff --git a/local-cli/rnpm/link/src/getProjectDependencies.js b/local-cli/link/getProjectDependencies.js
similarity index 100%
rename from local-cli/rnpm/link/src/getProjectDependencies.js
rename to local-cli/link/getProjectDependencies.js
diff --git a/local-cli/rnpm/link/src/groupFilesByType.js b/local-cli/link/groupFilesByType.js
similarity index 100%
rename from local-cli/rnpm/link/src/groupFilesByType.js
rename to local-cli/link/groupFilesByType.js
diff --git a/local-cli/rnpm/link/src/ios/addFileToProject.js b/local-cli/link/ios/addFileToProject.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/addFileToProject.js
rename to local-cli/link/ios/addFileToProject.js
diff --git a/local-cli/rnpm/link/src/ios/addProjectToLibraries.js b/local-cli/link/ios/addProjectToLibraries.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/addProjectToLibraries.js
rename to local-cli/link/ios/addProjectToLibraries.js
diff --git a/local-cli/rnpm/link/src/ios/addSharedLibraries.js b/local-cli/link/ios/addSharedLibraries.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/addSharedLibraries.js
rename to local-cli/link/ios/addSharedLibraries.js
diff --git a/local-cli/rnpm/link/src/ios/addToHeaderSearchPaths.js b/local-cli/link/ios/addToHeaderSearchPaths.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/addToHeaderSearchPaths.js
rename to local-cli/link/ios/addToHeaderSearchPaths.js
diff --git a/local-cli/rnpm/link/src/ios/copyAssets.js b/local-cli/link/ios/copyAssets.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/copyAssets.js
rename to local-cli/link/ios/copyAssets.js
diff --git a/local-cli/rnpm/link/src/ios/createGroup.js b/local-cli/link/ios/createGroup.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/createGroup.js
rename to local-cli/link/ios/createGroup.js
diff --git a/local-cli/rnpm/link/src/ios/createGroupWithMessage.js b/local-cli/link/ios/createGroupWithMessage.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/createGroupWithMessage.js
rename to local-cli/link/ios/createGroupWithMessage.js
diff --git a/local-cli/rnpm/link/src/ios/getBuildProperty.js b/local-cli/link/ios/getBuildProperty.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getBuildProperty.js
rename to local-cli/link/ios/getBuildProperty.js
diff --git a/local-cli/rnpm/link/src/ios/getGroup.js b/local-cli/link/ios/getGroup.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getGroup.js
rename to local-cli/link/ios/getGroup.js
diff --git a/local-cli/rnpm/link/src/ios/getHeaderSearchPath.js b/local-cli/link/ios/getHeaderSearchPath.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getHeaderSearchPath.js
rename to local-cli/link/ios/getHeaderSearchPath.js
diff --git a/local-cli/rnpm/link/src/ios/getHeadersInFolder.js b/local-cli/link/ios/getHeadersInFolder.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getHeadersInFolder.js
rename to local-cli/link/ios/getHeadersInFolder.js
diff --git a/local-cli/rnpm/link/src/ios/getPlist.js b/local-cli/link/ios/getPlist.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getPlist.js
rename to local-cli/link/ios/getPlist.js
diff --git a/local-cli/rnpm/link/src/ios/getPlistPath.js b/local-cli/link/ios/getPlistPath.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getPlistPath.js
rename to local-cli/link/ios/getPlistPath.js
diff --git a/local-cli/rnpm/link/src/ios/getProducts.js b/local-cli/link/ios/getProducts.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/getProducts.js
rename to local-cli/link/ios/getProducts.js
diff --git a/local-cli/rnpm/link/src/ios/hasLibraryImported.js b/local-cli/link/ios/hasLibraryImported.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/hasLibraryImported.js
rename to local-cli/link/ios/hasLibraryImported.js
diff --git a/local-cli/rnpm/link/src/ios/isInstalled.js b/local-cli/link/ios/isInstalled.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/isInstalled.js
rename to local-cli/link/ios/isInstalled.js
diff --git a/local-cli/rnpm/link/src/ios/mapHeaderSearchPaths.js b/local-cli/link/ios/mapHeaderSearchPaths.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/mapHeaderSearchPaths.js
rename to local-cli/link/ios/mapHeaderSearchPaths.js
diff --git a/local-cli/rnpm/link/src/ios/registerNativeModule.js b/local-cli/link/ios/registerNativeModule.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/registerNativeModule.js
rename to local-cli/link/ios/registerNativeModule.js
diff --git a/local-cli/rnpm/link/src/ios/removeFromHeaderSearchPaths.js b/local-cli/link/ios/removeFromHeaderSearchPaths.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeFromHeaderSearchPaths.js
rename to local-cli/link/ios/removeFromHeaderSearchPaths.js
diff --git a/local-cli/rnpm/link/src/ios/removeFromPbxItemContainerProxySection.js b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeFromPbxItemContainerProxySection.js
rename to local-cli/link/ios/removeFromPbxItemContainerProxySection.js
diff --git a/local-cli/rnpm/link/src/ios/removeFromPbxReferenceProxySection.js b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeFromPbxReferenceProxySection.js
rename to local-cli/link/ios/removeFromPbxReferenceProxySection.js
diff --git a/local-cli/rnpm/link/src/ios/removeFromProjectReferences.js b/local-cli/link/ios/removeFromProjectReferences.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeFromProjectReferences.js
rename to local-cli/link/ios/removeFromProjectReferences.js
diff --git a/local-cli/rnpm/link/src/ios/removeFromStaticLibraries.js b/local-cli/link/ios/removeFromStaticLibraries.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeFromStaticLibraries.js
rename to local-cli/link/ios/removeFromStaticLibraries.js
diff --git a/local-cli/rnpm/link/src/ios/removeProductGroup.js b/local-cli/link/ios/removeProductGroup.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeProductGroup.js
rename to local-cli/link/ios/removeProductGroup.js
diff --git a/local-cli/rnpm/link/src/ios/removeProjectFromLibraries.js b/local-cli/link/ios/removeProjectFromLibraries.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeProjectFromLibraries.js
rename to local-cli/link/ios/removeProjectFromLibraries.js
diff --git a/local-cli/rnpm/link/src/ios/removeProjectFromProject.js b/local-cli/link/ios/removeProjectFromProject.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeProjectFromProject.js
rename to local-cli/link/ios/removeProjectFromProject.js
diff --git a/local-cli/rnpm/link/src/ios/removeSharedLibraries.js b/local-cli/link/ios/removeSharedLibraries.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/removeSharedLibraries.js
rename to local-cli/link/ios/removeSharedLibraries.js
diff --git a/local-cli/rnpm/link/src/ios/unlinkAssets.js b/local-cli/link/ios/unlinkAssets.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/unlinkAssets.js
rename to local-cli/link/ios/unlinkAssets.js
diff --git a/local-cli/rnpm/link/src/ios/unregisterNativeModule.js b/local-cli/link/ios/unregisterNativeModule.js
similarity index 100%
rename from local-cli/rnpm/link/src/ios/unregisterNativeModule.js
rename to local-cli/link/ios/unregisterNativeModule.js
diff --git a/local-cli/rnpm/link/src/link.js b/local-cli/link/link.js
similarity index 94%
rename from local-cli/rnpm/link/src/link.js
rename to local-cli/link/link.js
index 22fed026660..9361a40a02f 100644
--- a/local-cli/rnpm/link/src/link.js
+++ b/local-cli/link/link.js
@@ -2,7 +2,6 @@ const log = require('npmlog');
 const path = require('path');
 const uniq = require('lodash').uniq;
 const flatten = require('lodash').flatten;
-const pkg = require('../package.json');
 
 const isEmpty = require('lodash').isEmpty;
 const promiseWaterfall = require('./promiseWaterfall');
@@ -93,7 +92,7 @@ const linkAssets = (project, assets) => {
  *
  * If optional argument [packageName] is provided, it's the only one that's checked
  */
-module.exports = function link(args, config) {
+function link(args, config) {
   var project;
   try {
     project = config.getProjectConfig();
@@ -129,8 +128,14 @@ module.exports = function link(args, config) {
   return promiseWaterfall(tasks).catch(err => {
     log.error(
       `It seems something went wrong while linking. Error: ${err.message} \n`
-      + `Please file an issue here: ${pkg.bugs.url}`
+      + `Please file an issue here: https://github.com/facebook/react-native/issues`
     );
     throw err;
   });
 };
+
+module.exports = {
+  func: link,
+  description: 'links all native dependencies',
+  name: 'link [packageName]',
+};
diff --git a/local-cli/rnpm/link/src/pollParams.js b/local-cli/link/pollParams.js
similarity index 100%
rename from local-cli/rnpm/link/src/pollParams.js
rename to local-cli/link/pollParams.js
diff --git a/local-cli/rnpm/link/src/promiseWaterfall.js b/local-cli/link/promiseWaterfall.js
similarity index 100%
rename from local-cli/rnpm/link/src/promiseWaterfall.js
rename to local-cli/link/promiseWaterfall.js
diff --git a/local-cli/rnpm/link/src/unlink.js b/local-cli/link/unlink.js
similarity index 95%
rename from local-cli/rnpm/link/src/unlink.js
rename to local-cli/link/unlink.js
index cf5ab922405..3e027b82e20 100644
--- a/local-cli/rnpm/link/src/unlink.js
+++ b/local-cli/link/unlink.js
@@ -60,7 +60,7 @@ const unlinkDependencyIOS = (iOSProject, dependency, packageName, iOSDependencie
  * If optional argument [packageName] is provided, it's the only one
  * that's checked
  */
-module.exports = function unlink(args, config) {
+function unlink(args, config) {
   const packageName = args[0];
 
   var project;
@@ -118,3 +118,9 @@ module.exports = function unlink(args, config) {
 
   return Promise.resolve();
 };
+
+module.exports = {
+  func: unlink,
+  description: 'unlink native dependency',
+  name: 'unlink <packageName>',
+};
diff --git a/local-cli/rnpm/core/package.json b/local-cli/rnpm/core/package.json
deleted file mode 100644
index 2ff57ffd09f..00000000000
--- a/local-cli/rnpm/core/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "rnpm",
-  "version": "1.7.0",
-  "description": "React Native Package Manager",
-  "main": "./src/getCommands.js",
-  "scripts": {
-    "test": "jest"
-  },
-  "jest": {
-    "testDirectoryName": "test",
-    "collectCoverage": true,
-    "testRunner": "<rootDir>/node_modules/jest-cli/src/testRunners/jasmine/jasmine2.js"
-  },
-  "author": "Amazing React Native Community (https://github.com/facebook/react-native)",
-  "contributors": [
-    "Alexey Kureev <kureev-mail@ya.ru> (https://github.com/Kureev)",
-    "Mike Grabowski <grabbou@gmail.com> (https://github.com/grabbou)"
-  ],
-  "engines": {
-    "node": ">= 4.0.0"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/rnpm/rnpm/issues"
-  },
-  "keywords": [
-    "react-native",
-    "native-modules",
-    "packager",
-    "rnpm"
-  ],
-  "homepage": "https://github.com/rnpm/rnpm#readme",
-  "dependencies": {
-    "commander": "^2.9.0",
-    "glob": "^7.0.1",
-    "lodash": "^3.10.1",
-    "rnpm-plugin-install": "^1.1.0",
-    "rnpm-plugin-link": "^1.7.4",
-    "update-notifier": "^0.6.0",
-    "xmldoc": "^0.4.0"
-  },
-  "devDependencies": {
-    "babel-eslint": "^4.1.5",
-    "eslint": "^1.9.0",
-    "mock-fs": "^3.5.0",
-    "mock-require": "^1.2.1",
-    "rewire": "^2.5.1",
-    "jest-cli": "^0.9.0-fb2"
-  }
-}
diff --git a/local-cli/rnpm/install/install.js b/local-cli/rnpm/install/install.js
deleted file mode 100644
index bb43a2787d9..00000000000
--- a/local-cli/rnpm/install/install.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  func: require('./src/install'),
-  description: 'install and link native dependencies',
-  name: 'install <packageName>',
-};
diff --git a/local-cli/rnpm/install/package.json b/local-cli/rnpm/install/package.json
deleted file mode 100644
index e0f49873567..00000000000
--- a/local-cli/rnpm/install/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "rnpm-plugin-install",
-  "version": "1.1.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rnpm/rnpm-plugin-install.git"
-  },
-  "author": "Alexey Kureev <kureev-mail@ya.ru> (https://github.com/Kureev)",
-  "contributors": [
-    "Alexey Kureev <kureev-mail@ya.ru> (https://github.com/Kureev)",
-    "Mike Grabowski <grabbou@gmail.com> (https://github.com/grabbou)"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/rnpm/rnpm-plugin-install/issues"
-  },
-  "homepage": "https://github.com/rnpm/rnpm-plugin-install#readme",
-  "dependencies": {
-    "npmlog": "^2.0.2"
-  }
-}
diff --git a/local-cli/rnpm/install/uninstall.js b/local-cli/rnpm/install/uninstall.js
deleted file mode 100644
index 258cae1b064..00000000000
--- a/local-cli/rnpm/install/uninstall.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  func: require('./src/uninstall'),
-  description: 'uninstall and unlink native dependencies',
-  name: 'uninstall <packageName>',
-};
diff --git a/local-cli/rnpm/link/link.js b/local-cli/rnpm/link/link.js
deleted file mode 100644
index e6ab05c8d48..00000000000
--- a/local-cli/rnpm/link/link.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  func: require('./src/link'),
-  description: 'links all native dependencies',
-  name: 'link [packageName]',
-};
diff --git a/local-cli/rnpm/link/package.json b/local-cli/rnpm/link/package.json
deleted file mode 100644
index 74f49e1a3aa..00000000000
--- a/local-cli/rnpm/link/package.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "name": "rnpm-plugin-link",
-  "version": "1.7.4",
-  "description": "rnpm plugin that links native dependencies to your project",
-  "main": "index.js",
-  "scripts": {
-    "test": "eslint ./ && mocha ./test --recursive"
-  },
-  "keywords": [
-    "rnpm",
-    "react-native",
-    "react-native link"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rnpm/rnpm.git"
-  },
-  "engines": {
-    "node": ">= 4.0.0"
-  },
-  "author": "Amazing React Native Community (https://github.com/facebook/react-native)",
-  "contributors": [
-    "Alexey Kureev <kureev-mail@ya.ru> (https://github.com/Kureev)",
-    "Mike Grabowski <grabbou@gmail.com> (https://github.com/grabbou)"
-  ],
-  "bugs": {
-    "url": "https://github.com/rnpm/rnpm/issues"
-  },
-  "homepage": "https://github.com/rnpm/rnpm#readme",
-  "license": "MIT",
-  "dependencies": {
-    "fs-extra": "^0.26.2",
-    "glob": "^7.0.0",
-    "inquirer": "^0.12.0",
-    "lodash": "^3.10.1",
-    "mime": "^1.3.4",
-    "npmlog": "^2.0.0",
-    "plist": "^1.2.0",
-    "semver": "^5.1.0",
-    "to-camel-case": "^1.0.0",
-    "xcode": "^0.8.2"
-  },
-  "devDependencies": {
-    "babel-eslint": "^4.1.5",
-    "chai": "^3.4.1",
-    "eslint": "^1.9.0",
-    "mocha": "^2.3.4",
-    "mock-fs": "^3.5.0",
-    "mock-require": "^1.2.1",
-    "sinon": "^1.17.2"
-  }
-}
diff --git a/local-cli/rnpm/link/unlink.js b/local-cli/rnpm/link/unlink.js
deleted file mode 100644
index 56ca0ec674b..00000000000
--- a/local-cli/rnpm/link/unlink.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  func: require('./src/unlink'),
-  description: 'unlink native dependency',
-  name: 'unlink <packageName>',
-};