diff --git a/.gitignore b/.gitignore
index 211f836467..4251759b6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,20 +8,6 @@
 **/.arclint
 **/arclib
 
-##### Client Private Plugins (symlinked)
-**/client-app/src/error-logger-extensions
-**/client-app/src/nylas-private-*
-**/internal_packages/nylas-private-*
-**/internal_packages/activity-list
-**/internal_packages/composer-mail-merge
-**/internal_packages/composer-scheduler
-**/internal_packages/link-tracking
-**/internal_packages/open-tracking
-**/internal_packages/send-later
-**/internal_packages/send-reminders
-**/internal_packages/thread-sharing
-**/internal_packages/client-sync
-
 ##### Node modules
 node_modules
 !packages/client-app/spec/fixtures/packages/package-with-incompatible-native-module/node_modules
diff --git a/deploy-it b/deploy-it
deleted file mode 100755
index bda8e17fd7..0000000000
--- a/deploy-it
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# deploy-it is the script we use to deploy changes to our Nylas Mail backend systems.
-# it tags releases automatically and helps prevent obvious mistakes like
-# deploying a non-production branch to our prod infra.
-import sys
-import subprocess
-
-if len(sys.argv) != 2 or sys.argv[1] in ('-h', '--help'):
-    print "deploy-it is the script we use to deploy changes to our Nylas Mail backend systems."
-    print
-    print "usage: ./deploy-it environment"
-    print
-    print "The currently checked out commit will be deployed!"
-    sys.exit(-1)
-
-environment = sys.argv[1]
-level = 'prod'
-if 'staging' in environment or 'ei-prod' in environment:
-    level = 'staging'
-elif 'dev' in environment:
-    level = 'dev'
-
-branch = subprocess.check_output('git rev-parse --abbrev-ref HEAD'.split()).strip()
-
-if level == 'prod' and branch != 'production':
-    sys.exit("Deploys to production environments must be made from the 'production' "
-             "branch.")
-
-if level == 'prod':
-    print "Fetching latest repo data."
-    # this can fail for all sorts of reasons; best to just let a human
-    # deal with any errors
-    try:
-        subprocess.check_call(['git', 'pull'])
-    except:
-        sys.exit("`git pull` failed — can't proceed.")
-
-# Tag the deploy so that we know exactly what has been deployed by whom.
-short_commit = subprocess.check_output('git rev-parse --short HEAD'.split()).strip()
-username = subprocess.check_output(['whoami']).strip()
-tag_name = "{}-{}-{}".format(short_commit, environment, username)
-
-# Check if the tag already exists.
-if subprocess.call(['git', 'rev-parse', '-q', '--verify', tag_name]) != 0:
-    # If not create it.
-    try:
-        print "Tagging deploy..."
-        subprocess.check_call(['git', 'tag', '-a', tag_name, '-m', "'{}'".format(tag_name)])
-        subprocess.check_call(['git', 'push', 'origin', tag_name])
-    except:
-        sys.exit("Unable to create and save tag — won't proceed.")
-
-# Hand things off to `eb deploy`. It will push a tagged release to EB.
-try:
-    print "Handing off to `eb deploy`... (this may take some time!)"
-    print
-    print "You can monitor your deploy using the Elastic Beanstalk console:"
-    print "https://us-west-2.console.aws.amazon.com/elasticbeanstalk/home?region=us-west-2#/applications"
-    print
-    subprocess.check_call(['eb', 'deploy', environment])
-except:
-    sys.exit("eb deploy failed!")
diff --git a/packages/client-app/build/Gruntfile.js b/packages/client-app/build/Gruntfile.js
index 00808d5cb6..f0e596e4b7 100644
--- a/packages/client-app/build/Gruntfile.js
+++ b/packages/client-app/build/Gruntfile.js
@@ -74,12 +74,11 @@ module.exports = (grunt) => {
       // The Windows electron-winstaller task must be run outside of grunt
     ]);
   } else if (grunt.option('platform') === 'darwin') {
-    const subTasks = process.env.SIGN_BUILD ? ["setup-mac-keychain"] : []
-    grunt.registerTask("build-client", subTasks.concat([
+    grunt.registerTask("build-client", [
       "package",
       "create-mac-zip",
       "create-mac-dmg",
-    ]));
+    ]);
   } else if (grunt.option('platform') === 'linux') {
     grunt.registerTask("build-client", [
       "package",
@@ -87,6 +86,4 @@ module.exports = (grunt) => {
       "create-rpm-installer",
     ]);
   }
-
-  grunt.registerTask("upload-client", ["upload"])
 }
diff --git a/packages/client-app/build/create-signed-windows-installer.js b/packages/client-app/build/create-signed-windows-installer.js
deleted file mode 100644
index 7ffa150ebb..0000000000
--- a/packages/client-app/build/create-signed-windows-installer.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint import/no-dynamic-require:0 */
-/**
- * NOTE: Due to path issues, this script must be run outside of grunt
- * directly from a powershell command.
- */
-const path = require('path')
-const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
-
-const appDir = path.join(__dirname, "..");
-const version = require(path.join(appDir, 'package.json')).version;
-
-const config = {
-  usePackageJson: false,
-  outputDirectory: path.join(appDir, 'dist'),
-  appDirectory: path.join(appDir, 'dist', 'nylas-win32-ia32'),
-  loadingGif: path.join(appDir, 'build', 'resources', 'win', 'loading.gif'),
-  iconUrl: 'http://edgehill.s3.amazonaws.com/static/nylas.ico',
-  certificateFile: process.env.CERTIFICATE_FILE,
-  certificatePassword: process.env.WINDOWS_CODESIGN_KEY_PASSWORD,
-  description: "Nylas Mail",
-  version: version,
-  title: "nylas",
-  authors: 'Nylas Inc.',
-  setupIcon: path.join(appDir, 'build', 'resources', 'win', 'nylas.ico'),
-  setupExe: 'NylasMailSetup.exe',
-  exe: 'nylas.exe',
-  name: 'NylasMail',
-}
-console.log(config);
-console.log("---> Starting")
-createWindowsInstaller(config, console.log, console.error)
diff --git a/packages/client-app/build/tasks/package-task.js b/packages/client-app/build/tasks/package-task.js
index 779a8b0844..509fb6dc94 100644
--- a/packages/client-app/build/tasks/package-task.js
+++ b/packages/client-app/build/tasks/package-task.js
@@ -231,12 +231,6 @@ module.exports = (grunt) => {
       'out': grunt.config('outputDir'),
       'overwrite': true,
       'prune': true,
-      /**
-       * This will automatically look for the identity in the keychain. It
-       * runs the `security find-identity` command. Note that
-       * setup-mac-keychain-task needs to be run first
-       */
-      'osx-sign': !!process.env.SIGN_BUILD,
       'win32metadata': {
         CompanyName: 'Nylas, Inc.',
         FileDescription: 'Nylas Mail',
diff --git a/packages/client-app/build/tasks/setup-mac-keychain-task.js b/packages/client-app/build/tasks/setup-mac-keychain-task.js
deleted file mode 100644
index 1e1f6529bd..0000000000
--- a/packages/client-app/build/tasks/setup-mac-keychain-task.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/* eslint global-require: 0 */
-const path = require('path');
-const fs = require('fs-plus');
-
-// Codesigning is a Mac-only process that requires a valid Apple
-// certificate, the private key, and access to the Mac keychain.
-//
-// We can only codesign from keys in the keychain. At the end of the day
-// we need the certificate and private key to exist in the keychain
-//
-// In the case of Travis, we need to setup a temp keychain from encrypted
-// files in the repository.  # We'll decrypt and import our certificates,
-// put them in a temporary keychain, and use that.
-//
-// If you want to verify the app was signed you can run the commands:
-//
-//     spctl -a -t exec -vv /path/to/N1.app
-//
-// Which should return "satisfies its Designated Requirement"
-//
-// And:
-//
-//     codesign --verify --deep --verbose=2 /path/to/N1.app
-//
-// Which should return "accepted"
-module.exports = (grunt) => {
-  let getCertData;
-  const {spawnP} = grunt.config('taskHelpers')
-  const tmpKeychain = "n1-build.keychain";
-
-  const unlockKeychain = (keychain, keychainPass) => {
-    const args = ['unlock-keychain', '-p', keychainPass, keychain];
-    return spawnP({cmd: "security", args});
-  };
-
-  const cleanupKeychain = () => {
-    if (fs.existsSync(path.join(process.env.HOME, "Library", "Keychains", tmpKeychain))) {
-      return spawnP({cmd: "security", args: ["delete-keychain", tmpKeychain]});
-    }
-    return Promise.resolve()
-  };
-
-  const buildMacKeychain = () => {
-    const crypto = require('crypto');
-    const tmpPass = crypto.randomBytes(32).toString('hex');
-    const {appleCert, nylasCert, nylasPrivateKey, keyPass} = getCertData();
-    const codesignBin = path.join("/", "usr", "bin", "codesign");
-
-    // Create a custom, temporary keychain
-    return cleanupKeychain()
-    .then(() => spawnP({cmd: "security", args: ["create-keychain", '-p', tmpPass, tmpKeychain]}))
-
-    // Due to a bug in OSX, you must list-keychain with -s in order for it
-    // to actually add it to the list of keychains. See http://stackoverflow.com/questions/20391911/os-x-keychain-not-visible-to-keychain-access-app-in-mavericks
-    .then(() => spawnP({cmd: "security", args: ["list-keychains", "-s", tmpKeychain]}))
-
-    // Make the custom keychain default, so xcodebuild will use it for signing
-    .then(() => spawnP({cmd: "security", args: ["default-keychain", "-s", tmpKeychain]}))
-
-    // Unlock the keychain
-    .then(() => unlockKeychain(tmpKeychain, tmpPass))
-
-    // Set keychain timeout to 1 hour for long builds
-    .then(() => spawnP({cmd: "security", args: ["set-keychain-settings", "-t", "3600", "-l", tmpKeychain]}))
-
-    // Add certificates to keychain and allow codesign to access them
-    .then(() => spawnP({cmd: "security", args: ["import", appleCert, "-k", tmpKeychain, "-T", codesignBin]}))
-
-    .then(() => spawnP({cmd: "security", args: ["import", nylasCert, "-k", tmpKeychain, "-T", codesignBin]}))
-
-    // Load the password for the private key from environment variables
-    .then(() => spawnP({cmd: "security", args: ["import", nylasPrivateKey, "-k", tmpKeychain, "-P", keyPass, "-T", codesignBin]}));
-  };
-
-  getCertData = () => {
-    const certs = path.resolve(path.join(grunt.config('buildDir'), 'resources', 'certs', 'mac'));
-    const appleCert = path.join(certs, 'AppleWWDRCA.cer');
-    const nylasCert = path.join(certs, 'mac-nylas-n1.cer');
-    const nylasPrivateKey = path.join(certs, 'mac-nylas-n1.p12');
-
-    const keyPass = process.env.APPLE_CODESIGN_KEY_PASSWORD;
-
-    if (!keyPass) {
-      throw new Error("APPLE_CODESIGN_KEY_PASSWORD must be set");
-    }
-    if (!fs.existsSync(appleCert)) {
-      throw new Error(`${appleCert} doesn't exist`);
-    }
-    if (!fs.existsSync(nylasCert)) {
-      throw new Error(`${nylasCert} doesn't exist`);
-    }
-    if (!fs.existsSync(nylasPrivateKey)) {
-      throw new Error(`${nylasPrivateKey} doesn't exist`);
-    }
-
-    return {appleCert, nylasCert, nylasPrivateKey, keyPass};
-  };
-
-  const shouldRun = () => {
-    if (process.platform !== 'darwin') {
-      grunt.log.writeln(`Skipping keychain setup since ${process.platform} is not darwin`);
-      return false
-    }
-    return !!process.env.SIGN_BUILD
-  }
-
-  grunt.registerTask('setup-mac-keychain', 'Setup Mac Keychain to sign the app', function setupMacKeychain() {
-    const done = this.async();
-    if (!shouldRun()) return done();
-
-    return buildMacKeychain().then(done).catch(grunt.fail.fatal);
-  });
-}
diff --git a/packages/client-app/build/tasks/upload-task.js b/packages/client-app/build/tasks/upload-task.js
deleted file mode 100644
index 4baf58f0b6..0000000000
--- a/packages/client-app/build/tasks/upload-task.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/* eslint global-require: 0 */
-/* eslint import/no-dynamic-require: 0 */
-const s3 = require('s3');
-const request = require('request');
-const Promise = require('bluebird');
-const path = require('path');
-const fs = require('fs-plus');
-
-
-let s3Client = null;
-let packageVersion = null;
-let fullVersion = null;
-
-module.exports = (grunt) => {
-  const {spawn} = grunt.config('taskHelpers');
-
-  function populateVersion() {
-    return new Promise((resolve, reject) => {
-      const json = grunt.config.get('appJSON')
-      const cmd = 'git';
-      const args = ['rev-parse', '--short', 'HEAD'];
-      spawn({cmd, args}, (error, {stdout} = {}) => {
-        if (error) {
-          return reject();
-        }
-        const commitHash = (stdout ? stdout.trim() : "").slice(0, 7);
-        packageVersion = json.version;
-        if (packageVersion.indexOf('-') > 0) {
-          fullVersion = packageVersion;
-        } else {
-          fullVersion = `${packageVersion}-${commitHash}`;
-        }
-        return resolve();
-      });
-    });
-  }
-
-  function postToSlack(msg) {
-    if (!process.env.NYLAS_INTERNAL_HOOK_URL) {
-      return Promise.resolve();
-    }
-    return new Promise((resolve, reject) =>
-      request.post({
-        url: process.env.NYLAS_INTERNAL_HOOK_URL,
-        json: {
-          username: "Edgehill Builds",
-          text: msg,
-        },
-      }
-      , (error) => {
-        return error ? reject(error) : resolve();
-      })
-    );
-  }
-
-  function put(localSource, destName, options = {}) {
-    grunt.log.writeln(`>> Uploading ${localSource} to S3…`);
-
-    const write = grunt.log.writeln;
-    let lastPc = 0;
-
-    const params = {
-      Key: destName,
-      ACL: "public-read",
-      Bucket: "edgehill",
-    };
-    Object.assign(params, options);
-
-    return new Promise((resolve, reject) => {
-      const uploader = s3Client.uploadFile({
-        localFile: localSource,
-        s3Params: params,
-      });
-      uploader.on("error", err => reject(err));
-      uploader.on("progress", () => {
-        const pc = Math.round((uploader.progressAmount / uploader.progressTotal) * 100.0);
-        if (pc !== lastPc) {
-          lastPc = pc;
-          write(`>> Uploading ${destName} ${pc}%`);
-          return;
-        }
-      });
-      uploader.on("end", data => resolve(data));
-    });
-  }
-
-  function uploadToS3(filepath, key) {
-    grunt.log.writeln(`>> Uploading ${filepath} to ${key}…`);
-    return put(filepath, key).then((data) => {
-      const msg = `Nylas Mail release asset uploaded: <${data.Location}|${key}>`;
-      return postToSlack(msg).then(() => Promise.resolve(data));
-    });
-  }
-
-  grunt.registerTask("upload", "Upload Nylas build", function upload() {
-    const done = this.async();
-
-    populateVersion()
-    .then(() => {
-      // find files to upload
-      const outputDir = grunt.config.get('outputDir');
-      const uploads = [];
-
-      // We increment the version so we have an autoupdate target to test
-      const [version, hash] = fullVersion.split('-');
-      const versionParts = version.split('.')
-      versionParts[2] = +versionParts[2] + 1
-      const nextVersion = `${versionParts.join('.')}-${hash}`
-
-      const s3PathCurrentVersion = `${fullVersion}/${process.platform}/${process.arch}`
-      const s3PathNextVersion = `${nextVersion}/${process.platform}/${process.arch}`
-
-      if (process.platform === 'darwin') {
-        uploads.push({
-          source: `${outputDir}/NylasMail.zip`,
-          key: `${s3PathCurrentVersion}/NylasMail.zip`,
-        });
-        uploads.push({
-          source: `${outputDir}/NylasMail.zip`,
-          key: `${s3PathNextVersion}/NylasMail.zip`,
-        });
-        uploads.push({
-          source: `${outputDir}/NylasMail.dmg`,
-          key: `${s3PathCurrentVersion}/NylasMail.dmg`,
-        });
-      } else if (process.platform === 'win32') {
-        uploads.push({
-          source: path.join(outputDir, "RELEASES"),
-          key: `${s3PathCurrentVersion}/RELEASES`,
-        });
-        uploads.push({
-          source: path.join(outputDir, "NylasMailSetup.exe"),
-          key: `${s3PathCurrentVersion}/NylasMailSetup.exe`,
-        });
-        uploads.push({
-          source: path.join(outputDir, `NylasMail-${packageVersion}-full.nupkg`),
-          key: `${s3PathCurrentVersion}/nylasmail-${packageVersion}-full.nupkg`,
-        });
-        uploads.push({
-          source: path.join(outputDir, "RELEASES"),
-          key: `${s3PathNextVersion}/RELEASES`,
-        });
-        uploads.push({
-          source: path.join(outputDir, "NylasMailSetup.exe"),
-          key: `${s3PathNextVersion}/NylasMailSetup.exe`,
-        });
-        uploads.push({
-          source: path.join(outputDir, `NylasMail-${packageVersion}-full.nupkg`),
-          key: `${s3PathNextVersion}/nylasmail-${packageVersion}-full.nupkg`,
-        });
-      } else if (process.platform === 'linux') {
-        const files = fs.readdirSync(outputDir);
-        for (const file of files) {
-          if (path.extname(file) === '.deb') {
-            uploads.push({
-              source: `${outputDir}/${file}`,
-              key: `${fullVersion}/${process.platform}-deb/${process.arch}/NylasMail.deb`,
-              options: {ContentType: "application/x-deb"},
-            });
-          }
-          if (path.extname(file) === '.rpm') {
-            uploads.push({
-              source: `${outputDir}/${file}`,
-              key: `${fullVersion}/${process.platform}-rpm/${process.arch}/NylasMail.rpm`,
-              options: {ContentType: "application/x-rpm"},
-            });
-          }
-        }
-      } else {
-        grunt.fail.fatal(`Unsupported platform: '${process.platform}'`);
-      }
-
-      const awsKey = process.env.AWS_ACCESS_KEY_ID != null ? process.env.AWS_ACCESS_KEY_ID : "";
-      const awsSecret = process.env.AWS_SECRET_ACCESS_KEY != null ? process.env.AWS_SECRET_ACCESS_KEY : "";
-
-      if (awsKey.length === 0) {
-        grunt.fail.fatal("Please set the AWS_ACCESS_KEY_ID environment variable");
-      }
-      if (awsSecret.length === 0) {
-        grunt.fail.fatal("Please set the AWS_SECRET_ACCESS_KEY environment variable");
-      }
-
-      s3Client = s3.createClient({
-        s3Options: {
-          accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-          scretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        },
-      });
-
-      return Promise.all(uploads.map(({source, key, options}) =>
-        uploadToS3(source, key, options))
-      )
-      .then(done)
-    })
-    .catch((err) => {
-      grunt.fail.fatal(err)
-    });
-  });
-}
diff --git a/packages/client-private-plugins/docs/ContinuousIntegration.md b/packages/client-app/docs/ContinuousIntegration.md
similarity index 100%
rename from packages/client-private-plugins/docs/ContinuousIntegration.md
rename to packages/client-app/docs/ContinuousIntegration.md
diff --git a/packages/client-private-plugins/packages/activity-list/assets/icon.png b/packages/client-app/internal_packages/activity-list/assets/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/assets/icon.png
rename to packages/client-app/internal_packages/activity-list/assets/icon.png
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-data-source.es6 b/packages/client-app/internal_packages/activity-list/lib/activity-data-source.es6
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-data-source.es6
rename to packages/client-app/internal_packages/activity-list/lib/activity-data-source.es6
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list-actions.es6 b/packages/client-app/internal_packages/activity-list/lib/activity-list-actions.es6
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list-actions.es6
rename to packages/client-app/internal_packages/activity-list/lib/activity-list-actions.es6
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list-button.jsx b/packages/client-app/internal_packages/activity-list/lib/activity-list-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list-button.jsx
rename to packages/client-app/internal_packages/activity-list/lib/activity-list-button.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list-empty-state.jsx b/packages/client-app/internal_packages/activity-list/lib/activity-list-empty-state.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list-empty-state.jsx
rename to packages/client-app/internal_packages/activity-list/lib/activity-list-empty-state.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list-item-container.jsx b/packages/client-app/internal_packages/activity-list/lib/activity-list-item-container.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list-item-container.jsx
rename to packages/client-app/internal_packages/activity-list/lib/activity-list-item-container.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list-store.jsx b/packages/client-app/internal_packages/activity-list/lib/activity-list-store.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list-store.jsx
rename to packages/client-app/internal_packages/activity-list/lib/activity-list-store.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/lib/activity-list.jsx b/packages/client-app/internal_packages/activity-list/lib/activity-list.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/activity-list.jsx
rename to packages/client-app/internal_packages/activity-list/lib/activity-list.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/lib/main.es6 b/packages/client-app/internal_packages/activity-list/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/main.es6
rename to packages/client-app/internal_packages/activity-list/lib/main.es6
diff --git a/packages/client-private-plugins/packages/activity-list/lib/plugin-helpers.es6 b/packages/client-app/internal_packages/activity-list/lib/plugin-helpers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/plugin-helpers.es6
rename to packages/client-app/internal_packages/activity-list/lib/plugin-helpers.es6
diff --git a/packages/client-private-plugins/packages/activity-list/lib/test-data-source.es6 b/packages/client-app/internal_packages/activity-list/lib/test-data-source.es6
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/lib/test-data-source.es6
rename to packages/client-app/internal_packages/activity-list/lib/test-data-source.es6
diff --git a/packages/client-private-plugins/packages/activity-list/package.json b/packages/client-app/internal_packages/activity-list/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/package.json
rename to packages/client-app/internal_packages/activity-list/package.json
diff --git a/packages/client-private-plugins/packages/activity-list/spec/activity-list-spec.jsx b/packages/client-app/internal_packages/activity-list/spec/activity-list-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/spec/activity-list-spec.jsx
rename to packages/client-app/internal_packages/activity-list/spec/activity-list-spec.jsx
diff --git a/packages/client-private-plugins/packages/activity-list/stylesheets/activity-list.less b/packages/client-app/internal_packages/activity-list/stylesheets/activity-list.less
similarity index 100%
rename from packages/client-private-plugins/packages/activity-list/stylesheets/activity-list.less
rename to packages/client-app/internal_packages/activity-list/stylesheets/activity-list.less
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/icon.png b/packages/client-app/internal_packages/composer-mail-merge/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/icon.png
rename to packages/client-app/internal_packages/composer-mail-merge/icon.png
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/listens-to-mail-merge-session.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/listens-to-mail-merge-session.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/listens-to-mail-merge-session.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/listens-to-mail-merge-session.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-body-token.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-body-token.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-body-token.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-body-token.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-button.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-button.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-button.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-composer-extension.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-composer-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-composer-extension.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-composer-extension.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-constants.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-constants.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-constants.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-container.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-container.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-container.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-container.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-draft-editing-session.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-draft-editing-session.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-draft-editing-session.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-draft-editing-session.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-header-input.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-header-input.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-header-input.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-header-input.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-participants-text-field.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-participants-text-field.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-participants-text-field.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-participants-text-field.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-send-button.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-send-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-send-button.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-send-button.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-subject-text-field.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-subject-text-field.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-subject-text-field.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-subject-text-field.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-table.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-table.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-table.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-table.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-token-dnd-handlers.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-token-dnd-handlers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-token-dnd-handlers.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-token-dnd-handlers.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-token.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-token.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-token.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-token.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-utils.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-utils.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-utils.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-utils.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-workspace.jsx b/packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-workspace.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/mail-merge-workspace.jsx
rename to packages/client-app/internal_packages/composer-mail-merge/lib/mail-merge-workspace.jsx
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/main.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/main.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/main.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/selection-state-reducers.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/selection-state-reducers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/selection-state-reducers.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/selection-state-reducers.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/send-many-drafts-task.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/send-many-drafts-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/send-many-drafts-task.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/send-many-drafts-task.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/table-state-reducers.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/table-state-reducers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/table-state-reducers.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/table-state-reducers.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/token-data-source.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/token-data-source.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/token-data-source.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/token-data-source.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/token-state-reducers.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/token-state-reducers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/token-state-reducers.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/token-state-reducers.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/lib/workspace-state-reducers.es6 b/packages/client-app/internal_packages/composer-mail-merge/lib/workspace-state-reducers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/lib/workspace-state-reducers.es6
rename to packages/client-app/internal_packages/composer-mail-merge/lib/workspace-state-reducers.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/package.json b/packages/client-app/internal_packages/composer-mail-merge/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/package.json
rename to packages/client-app/internal_packages/composer-mail-merge/package.json
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/fixtures.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/fixtures.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/fixtures.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/fixtures.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/mail-merge-draft-editing-session-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/mail-merge-draft-editing-session-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/mail-merge-draft-editing-session-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/mail-merge-draft-editing-session-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/mail-merge-utils-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/mail-merge-utils-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/mail-merge-utils-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/mail-merge-utils-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/selection-state-reducers-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/selection-state-reducers-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/selection-state-reducers-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/selection-state-reducers-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/send-many-drafts-task-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/send-many-drafts-task-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/send-many-drafts-task-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/send-many-drafts-task-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/table-state-reducers-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/table-state-reducers-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/table-state-reducers-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/table-state-reducers-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/token-state-reducers-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/token-state-reducers-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/token-state-reducers-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/token-state-reducers-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/spec/workspace-state-reducers-spec.es6 b/packages/client-app/internal_packages/composer-mail-merge/spec/workspace-state-reducers-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/spec/workspace-state-reducers-spec.es6
rename to packages/client-app/internal_packages/composer-mail-merge/spec/workspace-state-reducers-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-mail-merge/stylesheets/mail-merge.less b/packages/client-app/internal_packages/composer-mail-merge/stylesheets/mail-merge.less
similarity index 100%
rename from packages/client-private-plugins/packages/composer-mail-merge/stylesheets/mail-merge.less
rename to packages/client-app/internal_packages/composer-mail-merge/stylesheets/mail-merge.less
diff --git a/packages/client-private-plugins/packages/composer-scheduler/README.md b/packages/client-app/internal_packages/composer-scheduler/README.md
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/README.md
rename to packages/client-app/internal_packages/composer-scheduler/README.md
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-composer-scheduler@1x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-composer-scheduler@1x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-composer-scheduler@1x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-composer-scheduler@1x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-composer-scheduler@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-composer-scheduler@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-composer-scheduler@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-composer-scheduler@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-description@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-description@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-description@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-description@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-link@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-link@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-link@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-link@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-location@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-location@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-location@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-location@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-notes@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-notes@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-notes@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-notes@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-people@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-people@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-people@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-people@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-reminder@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-reminder@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-reminder@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-reminder@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-time@2x.png b/packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-time@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/assets/ic-eventcard-time@2x.png
rename to packages/client-app/internal_packages/composer-scheduler/assets/ic-eventcard-time@2x.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/icon.png b/packages/client-app/internal_packages/composer-scheduler/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/icon.png
rename to packages/client-app/internal_packages/composer-scheduler/icon.png
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-event.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-event.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-event.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-event.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-picker.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-picker.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/calendar/proposed-time-picker.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/calendar/proposed-time-picker.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/email-b64-images.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/composer/email-b64-images.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/email-b64-images.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/email-b64-images.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/email-images.json b/packages/client-app/internal_packages/composer-scheduler/lib/composer/email-images.json
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/email-images.json
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/email-images.json
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/event-datetime-input.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/event-datetime-input.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/event-datetime-input.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/event-datetime-input.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/event-prep-helper.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/composer/event-prep-helper.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/event-prep-helper.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/event-prep-helper.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-card-container.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-card-container.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-card-container.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-card-container.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-card.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-card.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-card.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-card.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-helper.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-helper.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-helper.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-helper.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-preview.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-preview.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/new-event-preview.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/new-event-preview.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/proposed-time-list.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/proposed-time-list.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/proposed-time-list.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/proposed-time-list.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/remove-event-helper.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/composer/remove-event-helper.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/remove-event-helper.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/remove-event-helper.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/scheduler-composer-button.jsx b/packages/client-app/internal_packages/composer-scheduler/lib/composer/scheduler-composer-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/scheduler-composer-button.jsx
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/scheduler-composer-button.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/composer/scheduler-composer-extension.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/composer/scheduler-composer-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/composer/scheduler-composer-extension.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/composer/scheduler-composer-extension.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/main.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/main.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/main.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/proposal.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/proposal.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/proposal.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/proposal.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/proposed-time-calendar-store.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/proposed-time-calendar-store.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/proposed-time-calendar-store.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/proposed-time-calendar-store.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/scheduler-actions.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/scheduler-actions.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/scheduler-actions.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/scheduler-actions.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/lib/scheduler-constants.es6 b/packages/client-app/internal_packages/composer-scheduler/lib/scheduler-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/lib/scheduler-constants.es6
rename to packages/client-app/internal_packages/composer-scheduler/lib/scheduler-constants.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/package.json b/packages/client-app/internal_packages/composer-scheduler/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/package.json
rename to packages/client-app/internal_packages/composer-scheduler/package.json
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/composer-scheduler-spec-helper.es6 b/packages/client-app/internal_packages/composer-scheduler/spec/composer-scheduler-spec-helper.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/composer-scheduler-spec-helper.es6
rename to packages/client-app/internal_packages/composer-scheduler/spec/composer-scheduler-spec-helper.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/new-event-card-spec.jsx b/packages/client-app/internal_packages/composer-scheduler/spec/new-event-card-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/new-event-card-spec.jsx
rename to packages/client-app/internal_packages/composer-scheduler/spec/new-event-card-spec.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/proposed-time-picker-spec.jsx b/packages/client-app/internal_packages/composer-scheduler/spec/proposed-time-picker-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/proposed-time-picker-spec.jsx
rename to packages/client-app/internal_packages/composer-scheduler/spec/proposed-time-picker-spec.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/scheduler-composer-button-spec.jsx b/packages/client-app/internal_packages/composer-scheduler/spec/scheduler-composer-button-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/scheduler-composer-button-spec.jsx
rename to packages/client-app/internal_packages/composer-scheduler/spec/scheduler-composer-button-spec.jsx
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/scheduler-composer-extension-spec.es6 b/packages/client-app/internal_packages/composer-scheduler/spec/scheduler-composer-extension-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/scheduler-composer-extension-spec.es6
rename to packages/client-app/internal_packages/composer-scheduler/spec/scheduler-composer-extension-spec.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/spec/test-proposal-data-source.es6 b/packages/client-app/internal_packages/composer-scheduler/spec/test-proposal-data-source.es6
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/spec/test-proposal-data-source.es6
rename to packages/client-app/internal_packages/composer-scheduler/spec/test-proposal-data-source.es6
diff --git a/packages/client-private-plugins/packages/composer-scheduler/stylesheets/scheduler.less b/packages/client-app/internal_packages/composer-scheduler/stylesheets/scheduler.less
similarity index 100%
rename from packages/client-private-plugins/packages/composer-scheduler/stylesheets/scheduler.less
rename to packages/client-app/internal_packages/composer-scheduler/stylesheets/scheduler.less
diff --git a/packages/client-private-plugins/packages/link-tracking/README.md b/packages/client-app/internal_packages/link-tracking/README.md
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/README.md
rename to packages/client-app/internal_packages/link-tracking/README.md
diff --git a/packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-unvisited@1x.png b/packages/client-app/internal_packages/link-tracking/assets/ic-tracking-unvisited@1x.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-unvisited@1x.png
rename to packages/client-app/internal_packages/link-tracking/assets/ic-tracking-unvisited@1x.png
diff --git a/packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-unvisited@2x.png b/packages/client-app/internal_packages/link-tracking/assets/ic-tracking-unvisited@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-unvisited@2x.png
rename to packages/client-app/internal_packages/link-tracking/assets/ic-tracking-unvisited@2x.png
diff --git a/packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-visited@1x.png b/packages/client-app/internal_packages/link-tracking/assets/ic-tracking-visited@1x.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-visited@1x.png
rename to packages/client-app/internal_packages/link-tracking/assets/ic-tracking-visited@1x.png
diff --git a/packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-visited@2x.png b/packages/client-app/internal_packages/link-tracking/assets/ic-tracking-visited@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/assets/ic-tracking-visited@2x.png
rename to packages/client-app/internal_packages/link-tracking/assets/ic-tracking-visited@2x.png
diff --git a/packages/client-private-plugins/packages/link-tracking/assets/linktracking-icon@2x.png b/packages/client-app/internal_packages/link-tracking/assets/linktracking-icon@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/assets/linktracking-icon@2x.png
rename to packages/client-app/internal_packages/link-tracking/assets/linktracking-icon@2x.png
diff --git a/packages/client-private-plugins/packages/link-tracking/icon.png b/packages/client-app/internal_packages/link-tracking/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/icon.png
rename to packages/client-app/internal_packages/link-tracking/icon.png
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/link-tracking-button.jsx b/packages/client-app/internal_packages/link-tracking/lib/link-tracking-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/link-tracking-button.jsx
rename to packages/client-app/internal_packages/link-tracking/lib/link-tracking-button.jsx
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/link-tracking-composer-extension.es6 b/packages/client-app/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/link-tracking-composer-extension.es6
rename to packages/client-app/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/link-tracking-constants.es6 b/packages/client-app/internal_packages/link-tracking/lib/link-tracking-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/link-tracking-constants.es6
rename to packages/client-app/internal_packages/link-tracking/lib/link-tracking-constants.es6
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/link-tracking-message-extension.jsx b/packages/client-app/internal_packages/link-tracking/lib/link-tracking-message-extension.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/link-tracking-message-extension.jsx
rename to packages/client-app/internal_packages/link-tracking/lib/link-tracking-message-extension.jsx
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/link-tracking-message-popover.jsx b/packages/client-app/internal_packages/link-tracking/lib/link-tracking-message-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/link-tracking-message-popover.jsx
rename to packages/client-app/internal_packages/link-tracking/lib/link-tracking-message-popover.jsx
diff --git a/packages/client-private-plugins/packages/link-tracking/lib/main.es6 b/packages/client-app/internal_packages/link-tracking/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/lib/main.es6
rename to packages/client-app/internal_packages/link-tracking/lib/main.es6
diff --git a/packages/client-private-plugins/packages/link-tracking/package.json b/packages/client-app/internal_packages/link-tracking/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/package.json
rename to packages/client-app/internal_packages/link-tracking/package.json
diff --git a/packages/client-private-plugins/packages/link-tracking/spec/link-tracking-composer-extension-spec.es6 b/packages/client-app/internal_packages/link-tracking/spec/link-tracking-composer-extension-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/spec/link-tracking-composer-extension-spec.es6
rename to packages/client-app/internal_packages/link-tracking/spec/link-tracking-composer-extension-spec.es6
diff --git a/packages/client-private-plugins/packages/link-tracking/stylesheets/main.less b/packages/client-app/internal_packages/link-tracking/stylesheets/main.less
similarity index 100%
rename from packages/client-private-plugins/packages/link-tracking/stylesheets/main.less
rename to packages/client-app/internal_packages/link-tracking/stylesheets/main.less
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Blond.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Blond.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Blond.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Blond.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Hair.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Hair.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Hair.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Hair.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Light.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Light.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Light.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Light.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Medium.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Medium.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Medium.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Medium.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Normal.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Normal.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Normal.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Normal.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-SemiBold.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-SemiBold.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-SemiBold.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-SemiBold.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Thin.otf b/packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Thin.otf
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/fonts/Nylas-Pro-Thin.otf
rename to packages/client-app/internal_packages/nylas-private-fonts/fonts/Nylas-Pro-Thin.otf
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/lib/main.es6 b/packages/client-app/internal_packages/nylas-private-fonts/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/lib/main.es6
rename to packages/client-app/internal_packages/nylas-private-fonts/lib/main.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/package.json b/packages/client-app/internal_packages/nylas-private-fonts/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/package.json
rename to packages/client-app/internal_packages/nylas-private-fonts/package.json
diff --git a/packages/client-private-plugins/packages/nylas-private-fonts/stylesheets/nylas-fonts.less b/packages/client-app/internal_packages/nylas-private-fonts/stylesheets/nylas-fonts.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-fonts/stylesheets/nylas-fonts.less
rename to packages/client-app/internal_packages/nylas-private-fonts/stylesheets/nylas-fonts.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/.gitignore b/packages/client-app/internal_packages/nylas-private-salesforce/.gitignore
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/.gitignore
rename to packages/client-app/internal_packages/nylas-private-salesforce/.gitignore
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/README.md b/packages/client-app/internal_packages/nylas-private-salesforce/README.md
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/README.md
rename to packages/client-app/internal_packages/nylas-private-salesforce/README.md
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/icon.png b/packages/client-app/internal_packages/nylas-private-salesforce/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/icon.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/icon.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/keymaps/salesforce.json b/packages/client-app/internal_packages/nylas-private-salesforce/keymaps/salesforce.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/keymaps/salesforce.json
rename to packages/client-app/internal_packages/nylas-private-salesforce/keymaps/salesforce.json
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/contact-search-results.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/contact-search-results.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/contact-search-results.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/contact-search-results.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/salesforce-composer-picker.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/salesforce-composer-picker.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/composer/salesforce-composer-picker.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/composer/salesforce-composer-picker.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/contact/salesforce-contact-info.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/contact/salesforce-contact-info.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/contact/salesforce-contact-info.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/contact/salesforce-contact-info.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/fetch-empty-schema-for-type.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/fetch-empty-schema-for-type.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/fetch-empty-schema-for-type.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/fetch-empty-schema-for-type.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/form-data-helpers.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/form-data-helpers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/form-data-helpers.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/form-data-helpers.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/generated-form-to-salesforce-adapter.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/generated-form-to-salesforce-adapter.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/generated-form-to-salesforce-adapter.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/generated-form-to-salesforce-adapter.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/pending-salesforce-object.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/pending-salesforce-object.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/pending-salesforce-object.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/pending-salesforce-object.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/remove-controls.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/remove-controls.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/remove-controls.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/remove-controls.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-object-form.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-object-form.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-object-form.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-object-form.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-object-picker.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-object-picker.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-object-picker.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-object-picker.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-schema-adapter.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-schema-adapter.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-schema-adapter.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-schema-adapter.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-window-launcher.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-window-launcher.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/salesforce-window-launcher.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/salesforce-window-launcher.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/smart-fields.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/form/smart-fields.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/form/smart-fields.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/form/smart-fields.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/main.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/main.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/main.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/main.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/metadata-helpers.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/metadata-helpers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/metadata-helpers.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/metadata-helpers.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/models/salesforce-object.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/models/salesforce-object.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/models/salesforce-object.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/models/salesforce-object.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/models/salesforce-schema.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/models/salesforce-schema.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/models/salesforce-schema.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/models/salesforce-schema.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/related-object-helpers.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/related-object-helpers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/related-object-helpers.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/related-object-helpers.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-actions.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-actions.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-actions.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-actions.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-api-error.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-api-error.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-api-error.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-api-error.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-api.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-api.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-api.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-api.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-constants.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-constants.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-constants.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-contact-crawler.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-contact-crawler.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-contact-crawler.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-contact-crawler.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-data-reset.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-data-reset.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-data-reset.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-data-reset.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-env.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-env.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-env.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-env.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-error-reporter.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-error-reporter.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-error-reporter.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-error-reporter.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-intro-notification.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-intro-notification.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-intro-notification.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-intro-notification.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-metadata-cleanup-listener.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-metadata-cleanup-listener.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-metadata-cleanup-listener.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-metadata-cleanup-listener.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-new-mail-listener.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-new-mail-listener.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-new-mail-listener.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-new-mail-listener.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-oauth.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-oauth.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-oauth.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-oauth.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-object-helpers.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-object-helpers.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-object-helpers.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-object-helpers.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-sync-worker.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-sync-worker.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/salesforce-sync-worker.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/salesforce-sync-worker.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/search/salesforce-search-indexer.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/search/salesforce-search-indexer.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/search/salesforce-search-indexer.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/search/salesforce-search-indexer.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/open-in-salesforce-btn.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/open-in-salesforce-btn.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/open-in-salesforce-btn.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/open-in-salesforce-btn.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/salesforce-icon.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/salesforce-icon.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/salesforce-icon.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/salesforce-icon.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/salesforce-login-prompt.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/salesforce-login-prompt.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/shared-components/salesforce-login-prompt.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/shared-components/salesforce-login-prompt.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/destroy-message-on-salesforce-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/destroy-message-on-salesforce-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/destroy-message-on-salesforce-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/destroy-message-on-salesforce-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/destroy-salesforce-object-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/destroy-salesforce-object-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/destroy-salesforce-object-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/destroy-salesforce-object-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/ensure-message-on-salesforce-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/ensure-message-on-salesforce-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/ensure-message-on-salesforce-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/ensure-message-on-salesforce-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/manually-relate-salesforce-object-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/manually-relate-salesforce-object-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/manually-relate-salesforce-object-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/manually-relate-salesforce-object-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/remove-manual-relation-to-salesforce-object-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/remove-manual-relation-to-salesforce-object-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/remove-manual-relation-to-salesforce-object-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/remove-manual-relation-to-salesforce-object-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/sync-salesforce-objects-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/sync-salesforce-objects-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/sync-salesforce-objects-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/sync-salesforce-objects-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/sync-thread-activity-to-salesforce-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/sync-thread-activity-to-salesforce-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/sync-thread-activity-to-salesforce-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/sync-thread-activity-to-salesforce-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/syncback-salesforce-object-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/syncback-salesforce-object-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/syncback-salesforce-object-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/syncback-salesforce-object-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/upsert-opportunity-contact-role-task.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/upsert-opportunity-contact-role-task.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/tasks/upsert-opportunity-contact-role-task.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/tasks/upsert-opportunity-contact-role-task.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/related-objects-for-thread.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/related-objects-for-thread.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/related-objects-for-thread.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/related-objects-for-thread.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-popover.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-popover.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-popover.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-sync-label.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-sync-label.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-sync-label.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-sync-label.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-sync-message-status.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-sync-message-status.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/salesforce-sync-message-status.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/salesforce-sync-message-status.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/sync-thread-toggle.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/sync-thread-toggle.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/lib/thread/sync-thread-toggle.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/lib/thread/sync-thread-toggle.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/menus/salesforce.json b/packages/client-app/internal_packages/nylas-private-salesforce/menus/salesforce.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/menus/salesforce.json
rename to packages/client-app/internal_packages/nylas-private-salesforce/menus/salesforce.json
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/package.json b/packages/client-app/internal_packages/nylas-private-salesforce/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/package.json
rename to packages/client-app/internal_packages/nylas-private-salesforce/package.json
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts-alt.json b/packages/client-app/internal_packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts-alt.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts-alt.json
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts-alt.json
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts.json b/packages/client-app/internal_packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts.json
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/fixtures/opportunity-layouts.json
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/form-builder-spec.jsx b/packages/client-app/internal_packages/nylas-private-salesforce/spec/form-builder-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/form-builder-spec.jsx
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/form-builder-spec.jsx
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/generate-test-data.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/spec/generate-test-data.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/generate-test-data.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/generate-test-data.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/salesforce-schema-adapter-spec.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/spec/salesforce-schema-adapter-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/salesforce-schema-adapter-spec.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/salesforce-schema-adapter-spec.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/spec/syncback-salesforce-object-task-spec.es6 b/packages/client-app/internal_packages/nylas-private-salesforce/spec/syncback-salesforce-object-task-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/spec/syncback-salesforce-object-task-spec.es6
rename to packages/client-app/internal_packages/nylas-private-salesforce/spec/syncback-salesforce-object-task-spec.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/cancel-button@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/cancel-button@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/cancel-button@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/cancel-button@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-large@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-large@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-large@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-large@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-small@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-small@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-small@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/ic-salesforce-cloud-btn-small@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-action@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-action@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-action@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-action@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-cloud@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-cloud@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-cloud@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-cloud@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-searchloupe@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-searchloupe@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-searchloupe@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-searchloupe@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-segment-error@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-segment-error@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icon-salesforce-segment-error@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icon-salesforce-segment-error@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/account_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/account_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/account_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/account_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/announcement_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/announcement_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/announcement_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/announcement_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/apps_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/apps_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/apps_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/apps_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/article_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/article_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/article_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/article_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/avatar_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/avatar_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/avatar_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/avatar_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/avatar_loading_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/avatar_loading_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/avatar_loading_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/avatar_loading_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/campaign_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/campaign_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/campaign_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/campaign_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/campaign_members_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/campaign_members_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/campaign_members_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/campaign_members_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/canvas_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/canvas_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/canvas_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/canvas_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/case_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/case_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/case_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/case_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/case_email_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/case_email_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/case_email_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/case_email_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/client_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/client_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/client_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/client_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/connected_apps_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/connected_apps_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/connected_apps_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/connected_apps_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/contact_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/contact_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/contact_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/contact_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/custom_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/custom_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/custom_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/custom_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/dashboard_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/dashboard_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/dashboard_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/dashboard_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/default_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/default_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/default_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/default_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/document_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/document_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/document_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/document_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/drafts_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/drafts_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/drafts_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/drafts_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/email_IQ_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/email_IQ_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/email_IQ_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/email_IQ_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/email_chatter_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/email_chatter_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/email_chatter_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/email_chatter_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/emailmessage_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/emailmessage_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/emailmessage_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/emailmessage_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/empty_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/empty_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/empty_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/empty_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/event_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/event_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/event_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/event_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/file_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/file_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/file_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/file_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/folder_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/folder_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/folder_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/folder_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/generic_loading_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/generic_loading_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/generic_loading_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/generic_loading_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/goals_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/goals_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/goals_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/goals_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/groups_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/groups_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/groups_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/groups_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/hierarchy_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/hierarchy_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/hierarchy_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/hierarchy_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/home_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/home_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/home_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/home_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/lead_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/lead_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/lead_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/lead_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/lead_convert_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/lead_convert_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/lead_convert_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/lead_convert_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/link_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/link_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/link_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/link_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/log_a_call_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/log_a_call_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/log_a_call_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/log_a_call_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/note_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/note_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/note_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/note_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/opportunity_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/opportunity_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/opportunity_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/opportunity_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/orders_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/orders_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/orders_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/orders_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/people_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/people_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/people_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/people_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/photo_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/photo_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/photo_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/photo_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/poll_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/poll_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/poll_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/poll_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/portal_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/portal_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/portal_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/portal_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/post_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/post_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/post_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/post_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/process_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/process_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/process_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/process_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/product_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/product_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/product_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/product_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/quotes_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/quotes_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/quotes_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/quotes_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/recent_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/recent_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/recent_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/recent_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/record_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/record_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/record_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/record_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/report_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/report_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/report_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/report_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/social_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/social_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/social_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/social_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/solution_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/solution_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/solution_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/solution_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/task2_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/task2_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/task2_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/task2_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/task_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/task_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/task_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/task_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/team_member_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/team_member_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/team_member_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/team_member_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/thanks_loading_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/thanks_loading_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/thanks_loading_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/thanks_loading_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/today_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/today_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/today_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/today_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/topic_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/topic_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/topic_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/topic_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/user_120.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/user_120.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/icons/user_120.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/icons/user_120.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/salesforce-icon@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/salesforce-icon@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/salesforce-icon@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/salesforce-icon@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/salesforce-logo@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/salesforce-logo@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/salesforce-logo@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/salesforce-logo@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/toolbar-chevron@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/toolbar-chevron@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/toolbar-chevron@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/toolbar-chevron@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/static/images/toolbar-templates@2x.png b/packages/client-app/internal_packages/nylas-private-salesforce/static/images/toolbar-templates@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/static/images/toolbar-templates@2x.png
rename to packages/client-app/internal_packages/nylas-private-salesforce/static/images/toolbar-templates@2x.png
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/open-in-salesforce-btn.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/open-in-salesforce-btn.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/open-in-salesforce-btn.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/open-in-salesforce-btn.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-association.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-association.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-association.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-association.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-composer.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-composer.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-composer.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-composer.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-contact.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-contact.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-contact.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-contact.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-icon.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-icon.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-icon.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-icon.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-object-form.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-object-form.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-object-form.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-object-form.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-object-picker.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-object-picker.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-object-picker.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-object-picker.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-picker.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-picker.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-picker.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-picker.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-related-object.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-related-object.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-related-object.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-related-object.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-sync-label.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-sync-label.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-sync-label.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-sync-label.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-sync-message-status.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-sync-message-status.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-sync-message-status.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-sync-message-status.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-welcome-view.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-welcome-view.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/salesforce-welcome-view.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/salesforce-welcome-view.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/search-results.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/search-results.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/search-results.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/search-results.less
diff --git a/packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/sync-thread-toggle.less b/packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/sync-thread-toggle.less
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-salesforce/stylesheets/sync-thread-toggle.less
rename to packages/client-app/internal_packages/nylas-private-salesforce/stylesheets/sync-thread-toggle.less
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_Confirm_v1.ogg b/packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_Confirm_v1.ogg
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_Confirm_v1.ogg
rename to packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_Confirm_v1.ogg
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_HitSend_v1.ogg b/packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_HitSend_v1.ogg
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_HitSend_v1.ogg
rename to packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_HitSend_v1.ogg
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_NewMail_v1.ogg b/packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_NewMail_v1.ogg
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_NewMail_v1.ogg
rename to packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_NewMail_v1.ogg
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_Send_v1.ogg b/packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_Send_v1.ogg
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/NYLAS_UI_Send_v1.ogg
rename to packages/client-app/internal_packages/nylas-private-sounds/NYLAS_UI_Send_v1.ogg
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/lib/main.es6 b/packages/client-app/internal_packages/nylas-private-sounds/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/lib/main.es6
rename to packages/client-app/internal_packages/nylas-private-sounds/lib/main.es6
diff --git a/packages/client-private-plugins/packages/nylas-private-sounds/package.json b/packages/client-app/internal_packages/nylas-private-sounds/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/nylas-private-sounds/package.json
rename to packages/client-app/internal_packages/nylas-private-sounds/package.json
diff --git a/packages/client-private-plugins/packages/open-tracking/README.md b/packages/client-app/internal_packages/open-tracking/README.md
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/README.md
rename to packages/client-app/internal_packages/open-tracking/README.md
diff --git a/packages/client-private-plugins/packages/open-tracking/assets/InMessage-opened@1x.png b/packages/client-app/internal_packages/open-tracking/assets/InMessage-opened@1x.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/assets/InMessage-opened@1x.png
rename to packages/client-app/internal_packages/open-tracking/assets/InMessage-opened@1x.png
diff --git a/packages/client-private-plugins/packages/open-tracking/assets/InMessage-opened@2x.png b/packages/client-app/internal_packages/open-tracking/assets/InMessage-opened@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/assets/InMessage-opened@2x.png
rename to packages/client-app/internal_packages/open-tracking/assets/InMessage-opened@2x.png
diff --git a/packages/client-private-plugins/packages/open-tracking/assets/icon-composer-eye@1x.png b/packages/client-app/internal_packages/open-tracking/assets/icon-composer-eye@1x.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/assets/icon-composer-eye@1x.png
rename to packages/client-app/internal_packages/open-tracking/assets/icon-composer-eye@1x.png
diff --git a/packages/client-private-plugins/packages/open-tracking/assets/icon-composer-eye@2x.png b/packages/client-app/internal_packages/open-tracking/assets/icon-composer-eye@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/assets/icon-composer-eye@2x.png
rename to packages/client-app/internal_packages/open-tracking/assets/icon-composer-eye@2x.png
diff --git a/packages/client-private-plugins/packages/open-tracking/assets/icon-tracking-opened@2x.png b/packages/client-app/internal_packages/open-tracking/assets/icon-tracking-opened@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/assets/icon-tracking-opened@2x.png
rename to packages/client-app/internal_packages/open-tracking/assets/icon-tracking-opened@2x.png
diff --git a/packages/client-private-plugins/packages/open-tracking/icon.png b/packages/client-app/internal_packages/open-tracking/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/icon.png
rename to packages/client-app/internal_packages/open-tracking/icon.png
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/main.es6 b/packages/client-app/internal_packages/open-tracking/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/main.es6
rename to packages/client-app/internal_packages/open-tracking/lib/main.es6
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-button.jsx b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-button.jsx
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-button.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-composer-extension.es6 b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-composer-extension.es6
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-constants.es6 b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-constants.es6
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-constants.es6
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-icon.jsx b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-icon.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-icon.jsx
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-icon.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-message-popover.jsx b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-message-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-message-popover.jsx
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-message-popover.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/lib/open-tracking-message-status.jsx b/packages/client-app/internal_packages/open-tracking/lib/open-tracking-message-status.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/lib/open-tracking-message-status.jsx
rename to packages/client-app/internal_packages/open-tracking/lib/open-tracking-message-status.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/package.json b/packages/client-app/internal_packages/open-tracking/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/package.json
rename to packages/client-app/internal_packages/open-tracking/package.json
diff --git a/packages/client-private-plugins/packages/open-tracking/spec/open-tracking-composer-extension-spec.es6 b/packages/client-app/internal_packages/open-tracking/spec/open-tracking-composer-extension-spec.es6
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/spec/open-tracking-composer-extension-spec.es6
rename to packages/client-app/internal_packages/open-tracking/spec/open-tracking-composer-extension-spec.es6
diff --git a/packages/client-private-plugins/packages/open-tracking/spec/open-tracking-icon-spec.jsx b/packages/client-app/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/spec/open-tracking-icon-spec.jsx
rename to packages/client-app/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/spec/open-tracking-message-status-spec.jsx b/packages/client-app/internal_packages/open-tracking/spec/open-tracking-message-status-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/spec/open-tracking-message-status-spec.jsx
rename to packages/client-app/internal_packages/open-tracking/spec/open-tracking-message-status-spec.jsx
diff --git a/packages/client-private-plugins/packages/open-tracking/stylesheets/main.less b/packages/client-app/internal_packages/open-tracking/stylesheets/main.less
similarity index 100%
rename from packages/client-private-plugins/packages/open-tracking/stylesheets/main.less
rename to packages/client-app/internal_packages/open-tracking/stylesheets/main.less
diff --git a/packages/client-private-plugins/packages/send-later/assets/ic-send-later-modal@2x.png b/packages/client-app/internal_packages/send-later/assets/ic-send-later-modal@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/assets/ic-send-later-modal@2x.png
rename to packages/client-app/internal_packages/send-later/assets/ic-send-later-modal@2x.png
diff --git a/packages/client-private-plugins/packages/send-later/icon.png b/packages/client-app/internal_packages/send-later/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/icon.png
rename to packages/client-app/internal_packages/send-later/icon.png
diff --git a/packages/client-private-plugins/packages/send-later/lib/main.es6 b/packages/client-app/internal_packages/send-later/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/lib/main.es6
rename to packages/client-app/internal_packages/send-later/lib/main.es6
diff --git a/packages/client-private-plugins/packages/send-later/lib/send-later-button.jsx b/packages/client-app/internal_packages/send-later/lib/send-later-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/lib/send-later-button.jsx
rename to packages/client-app/internal_packages/send-later/lib/send-later-button.jsx
diff --git a/packages/client-private-plugins/packages/send-later/lib/send-later-constants.es6 b/packages/client-app/internal_packages/send-later/lib/send-later-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/lib/send-later-constants.es6
rename to packages/client-app/internal_packages/send-later/lib/send-later-constants.es6
diff --git a/packages/client-private-plugins/packages/send-later/lib/send-later-popover.jsx b/packages/client-app/internal_packages/send-later/lib/send-later-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/lib/send-later-popover.jsx
rename to packages/client-app/internal_packages/send-later/lib/send-later-popover.jsx
diff --git a/packages/client-private-plugins/packages/send-later/lib/send-later-status.jsx b/packages/client-app/internal_packages/send-later/lib/send-later-status.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/lib/send-later-status.jsx
rename to packages/client-app/internal_packages/send-later/lib/send-later-status.jsx
diff --git a/packages/client-private-plugins/packages/send-later/package.json b/packages/client-app/internal_packages/send-later/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/package.json
rename to packages/client-app/internal_packages/send-later/package.json
diff --git a/packages/client-private-plugins/packages/send-later/spec/send-later-button-spec.jsx b/packages/client-app/internal_packages/send-later/spec/send-later-button-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/spec/send-later-button-spec.jsx
rename to packages/client-app/internal_packages/send-later/spec/send-later-button-spec.jsx
diff --git a/packages/client-private-plugins/packages/send-later/spec/send-later-popover-spec.jsx b/packages/client-app/internal_packages/send-later/spec/send-later-popover-spec.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/spec/send-later-popover-spec.jsx
rename to packages/client-app/internal_packages/send-later/spec/send-later-popover-spec.jsx
diff --git a/packages/client-private-plugins/packages/send-later/stylesheets/send-later-used-modal.less b/packages/client-app/internal_packages/send-later/stylesheets/send-later-used-modal.less
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/stylesheets/send-later-used-modal.less
rename to packages/client-app/internal_packages/send-later/stylesheets/send-later-used-modal.less
diff --git a/packages/client-private-plugins/packages/send-later/stylesheets/send-later.less b/packages/client-app/internal_packages/send-later/stylesheets/send-later.less
similarity index 100%
rename from packages/client-private-plugins/packages/send-later/stylesheets/send-later.less
rename to packages/client-app/internal_packages/send-later/stylesheets/send-later.less
diff --git a/packages/client-private-plugins/packages/send-reminders/assets/ic-send-reminders-modal@2x.png b/packages/client-app/internal_packages/send-reminders/assets/ic-send-reminders-modal@2x.png
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/assets/ic-send-reminders-modal@2x.png
rename to packages/client-app/internal_packages/send-reminders/assets/ic-send-reminders-modal@2x.png
diff --git a/packages/client-private-plugins/packages/send-reminders/icon.png b/packages/client-app/internal_packages/send-reminders/icon.png
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/icon.png
rename to packages/client-app/internal_packages/send-reminders/icon.png
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/main.es6 b/packages/client-app/internal_packages/send-reminders/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/main.es6
rename to packages/client-app/internal_packages/send-reminders/lib/main.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-account-sidebar-extension.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-account-sidebar-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-account-sidebar-extension.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-account-sidebar-extension.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-composer-button.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-composer-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-composer-button.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-composer-button.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-constants.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-constants.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-constants.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-headers.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-headers.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-headers.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-headers.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-mailbox-perspective.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-mailbox-perspective.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-mailbox-perspective.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-mailbox-perspective.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-popover-button.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-popover-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-popover-button.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-popover-button.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-popover.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-popover.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-popover.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-query-subscription.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-query-subscription.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-query-subscription.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-query-subscription.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-store.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-store.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-store.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-store.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-thread-list-extension.es6 b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-thread-list-extension.es6
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-thread-list-extension.es6
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-thread-list-extension.es6
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-toolbar-button.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-toolbar-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-toolbar-button.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-toolbar-button.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/lib/send-reminders-utils.jsx b/packages/client-app/internal_packages/send-reminders/lib/send-reminders-utils.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/lib/send-reminders-utils.jsx
rename to packages/client-app/internal_packages/send-reminders/lib/send-reminders-utils.jsx
diff --git a/packages/client-private-plugins/packages/send-reminders/package.json b/packages/client-app/internal_packages/send-reminders/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/package.json
rename to packages/client-app/internal_packages/send-reminders/package.json
diff --git a/packages/client-private-plugins/packages/send-reminders/stylesheets/reminders-used-modal.less b/packages/client-app/internal_packages/send-reminders/stylesheets/reminders-used-modal.less
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/stylesheets/reminders-used-modal.less
rename to packages/client-app/internal_packages/send-reminders/stylesheets/reminders-used-modal.less
diff --git a/packages/client-private-plugins/packages/send-reminders/stylesheets/send-reminders.less b/packages/client-app/internal_packages/send-reminders/stylesheets/send-reminders.less
similarity index 100%
rename from packages/client-private-plugins/packages/send-reminders/stylesheets/send-reminders.less
rename to packages/client-app/internal_packages/send-reminders/stylesheets/send-reminders.less
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/copy-button.jsx b/packages/client-app/internal_packages/thread-sharing/lib/copy-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/copy-button.jsx
rename to packages/client-app/internal_packages/thread-sharing/lib/copy-button.jsx
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/external-threads.es6 b/packages/client-app/internal_packages/thread-sharing/lib/external-threads.es6
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/external-threads.es6
rename to packages/client-app/internal_packages/thread-sharing/lib/external-threads.es6
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/main.es6 b/packages/client-app/internal_packages/thread-sharing/lib/main.es6
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/main.es6
rename to packages/client-app/internal_packages/thread-sharing/lib/main.es6
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-button.jsx b/packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-button.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-button.jsx
rename to packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-button.jsx
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-constants.es6 b/packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-constants.es6
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-constants.es6
rename to packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-constants.es6
diff --git a/packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-popover.jsx b/packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-popover.jsx
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/lib/thread-sharing-popover.jsx
rename to packages/client-app/internal_packages/thread-sharing/lib/thread-sharing-popover.jsx
diff --git a/packages/client-private-plugins/packages/thread-sharing/package.json b/packages/client-app/internal_packages/thread-sharing/package.json
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/package.json
rename to packages/client-app/internal_packages/thread-sharing/package.json
diff --git a/packages/client-private-plugins/packages/thread-sharing/stylesheets/main.less b/packages/client-app/internal_packages/thread-sharing/stylesheets/main.less
similarity index 100%
rename from packages/client-private-plugins/packages/thread-sharing/stylesheets/main.less
rename to packages/client-app/internal_packages/thread-sharing/stylesheets/main.less
diff --git a/packages/client-private-plugins/src/error-logger-extensions/nylas-private-error-reporter.js b/packages/client-app/src/error-logger-extensions/nylas-private-error-reporter.js
similarity index 100%
rename from packages/client-private-plugins/src/error-logger-extensions/nylas-private-error-reporter.js
rename to packages/client-app/src/error-logger-extensions/nylas-private-error-reporter.js
diff --git a/scripts/postinstall.es6 b/scripts/postinstall.es6
index e63d4d2c9f..1ca3eb3ce3 100644
--- a/scripts/postinstall.es6
+++ b/scripts/postinstall.es6
@@ -25,13 +25,6 @@ function unlinkIfExistsSync(p) {
   }
 }
 
-function copyErrorLoggerExtensions(privateDir) {
-  const from = path.join(privateDir, 'src')
-  const to = path.resolve(path.join('packages', 'client-app', 'src'))
-  unlinkIfExistsSync(path.join(to, 'error-logger-extensions'));
-  fs.copySync(from, to);
-}
-
 function installClientSyncPackage() {
   console.log("\n---> Linking client-sync")
   // link client-sync
@@ -41,25 +34,6 @@ function installClientSyncPackage() {
   fs.symlinkSync(clientSyncDir, destination, 'dir');
 }
 
-function installPrivateResources() {
-  console.log("\n---> Linking private plugins")
-  const privateDir = path.resolve(path.join('packages', 'client-private-plugins'))
-  if (!fs.existsSync(privateDir)) {
-    console.log("\n---> No client app to link. Moving on")
-    return;
-  }
-
-  copyErrorLoggerExtensions(privateDir)
-
-  // link private plugins
-  for (const plugin of fs.readdirSync(path.join(privateDir, 'packages'))) {
-    const from = path.resolve(path.join(privateDir, 'packages', plugin));
-    const to = path.resolve(path.join('packages', 'client-app', 'internal_packages', plugin));
-    unlinkIfExistsSync(to);
-    fs.symlinkSync(from, to, 'dir');
-  }
-}
-
 async function lernaBootstrap(installTarget) {
   console.log("\n---> Installing packages");
   const lernaCmd = process.platform === 'win32' ? 'lerna.cmd' : 'lerna';
@@ -169,7 +143,6 @@ async function main() {
     console.log(`\n---> Installing for target ${installTarget}`);
 
     if ([TARGET_ALL, TARGET_CLIENT].includes(installTarget)) {
-      installPrivateResources()
       installClientSyncPackage()
     }