diff --git a/client/modules/core/helpers/layout.js b/client/modules/core/helpers/layout.js
deleted file mode 100644
index b6bbd34502..0000000000
--- a/client/modules/core/helpers/layout.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import _ from "lodash";
-import { Meteor } from "meteor/meteor";
-import { Template } from "meteor/templating";
-import { Reaction } from "/client/api";
-import Logger from "/client/modules/logger";
-import * as Collections from "/lib/collections";
-
-/**
- * @name reactionTemplate
- * @summary use the reactionTemplate helper when you are using templates defined
- * as workflow templates in the package registry.Layout
- * use "collection" on the layout to indicate a workflow source
- * @memberof BlazeTemplateHelpers
- * @description reactionTemplate provides templates as defined in ReactionRegistry.Layout
- * @param {Object} options - workflow defaults to "coreLayout/coreWorkflow"
- * @returns {Array} returns an array with labels, templates that match workflow
- */
-Template.registerHelper("reactionTemplate", (options) => {
-  const shopId = options.hash.shopId || Reaction.getShopId();
-  // get shop info, defaults to current
-  const Shop = Collections.Shops.findOne(shopId);
-  const groupSub = Meteor.subscribe("Groups", { shopId });
-  let defaultRoles;
-  if (groupSub.ready()) {
-    const groups = Collections.Groups.findOne({ slug: "customer", shopId });
-    defaultRoles = groups.permissions;
-  }
-
-  const reactionTemplates = [];
-  // fetch collection from shop.layout configuration
-  let layout = _.find(Shop.layout, {
-    workflow: options.hash.workflow || "coreWorkflow"
-  });
-
-  let layoutConfigCollection;
-  let currentId;
-
-  // determine if workflow has a target
-  // collection defined. This is where we'll
-  // fetch/save workflow changes.
-  if (layout) {
-    layoutConfigCollection = layout.collection || "Cart";
-  } else {
-    Logger.error("Shop Layout Undefined");
-    layoutConfigCollection = "Cart";
-  }
-
-  // if we've got an id, we'll use it with the layout's collection
-  // and get the current status of the workflowTargetCollection
-  if (Template.currentData() && Template.currentData()._id) {
-    currentId = Template.currentData()._id;
-  }
-
-  // we'll get current cart status by default, as the most common case
-  // TODO: expand query options
-  currentId = options.hash.id || currentId;
-
-  // The currentCollection must have workflow schema attached.
-  // layoutConfigCollection is the collection defined in Shops.workflow
-  const workflowTargetCollection = Collections[layoutConfigCollection];
-  const currentCollection = workflowTargetCollection.findOne({ _id: currentId });
-  if (!currentCollection || !currentCollection.workflow) {
-    return reactionTemplates;
-  }
-
-  const currentStatus = currentCollection.workflow.status;
-  const currentCollectionWorkflow = currentCollection.workflow.workflow;
-  const packages = Collections.Packages.find({
-    layout: {
-      $elemMatch: options.hash
-    },
-    shopId
-  });
-
-  //  we can have multiple packages contributing to the layout / workflow
-  packages.forEach((reactionPackage) => {
-    const layoutWorkflows = _.filter(reactionPackage.layout, options.hash);
-    // check the packages for layout workflow templates
-    for (layout of layoutWorkflows) {
-      // audience is layout permissions
-      if (layout.audience === undefined) {
-        layout.audience = defaultRoles || "owner";
-      }
-
-      // check permissions so you don't have to on template.
-      if (Reaction.hasPermission(layout.audience)) {
-        // todo: review this hack to remove layout
-        // from the workflow
-        if (!layout.layout) {
-          // default is boolean false status
-          // true = we've completed this workflow
-          // false = pending (future) step
-          // <template> = in process (current) step.
-          layout.status = _.includes(currentCollectionWorkflow, layout.template);
-          // if the current template is already the current status
-          if (layout.template === currentStatus) {
-            layout.status = currentStatus;
-          }
-          // push to reactionTemplates
-          reactionTemplates.push(layout);
-        }
-      }
-    }
-  });
-
-  return reactionTemplates;
-});
diff --git a/client/modules/core/main.js b/client/modules/core/main.js
index 71aabbd58e..e3dc728ca8 100644
--- a/client/modules/core/main.js
+++ b/client/modules/core/main.js
@@ -349,20 +349,6 @@ export default {
     return "";
   },
 
-  /**
-   * @name getPrimaryShopSettings
-   * @method
-   * @memberof Core/Client
-   * @returns {Object} shop settings of the primary shop
-   */
-  getPrimaryShopSettings() {
-    const settings = Packages.findOne({
-      name: "core",
-      shopId: this.getPrimaryShopId()
-    }) || {};
-    return settings.settings || {};
-  },
-
   /**
    * @name getCurrentShop
    * @summary Get the proper current shop based on various checks. This mirrors the logic in
@@ -461,36 +447,6 @@ export default {
     return this.getShopId() === this.getPrimaryShopId();
   },
 
-  /**
-   * @name getShopName
-   * @method
-   * @memberof Core/Client
-   * @summary gets name of shop by provided shopId, or current active shop if shopId is not provided
-   * @param {String} providedShopId - shopId of shop to return name of
-   * @returns {String} - shop name
-   */
-  getShopName(providedShopId) {
-    const shopId = providedShopId || this.getShopId();
-    const shop = Shops.findOne({
-      _id: shopId
-    });
-    return shop && shop.name;
-  },
-
-  /**
-   * @name getShopSettings
-   * @method
-   * @memberof Core/Client
-   * @returns {Object} shop settings
-   */
-  getShopSettings() {
-    const settings = Packages.findOne({
-      name: "core",
-      shopId: this.shopId
-    }) || {};
-    return settings.settings || {};
-  },
-
   getShopLanguage() {
     const shopId = this.getShopId();
     const shop = Shops.findOne({ _id: shopId });
@@ -529,36 +485,6 @@ export default {
     return slug;
   },
 
-  /**
-   * @name getPackageSettings
-   * @method
-   * @memberof Core/Client
-   * @param {String} name package name
-   * @returns {Object} package settings
-   */
-  getPackageSettings(name) {
-    const shopId = this.getShopId();
-    const query = { name };
-
-    if (shopId) {
-      query.shopId = shopId;
-    }
-
-    return Packages.findOne(query);
-  },
-
-  /**
-   * @name getPackageSettingsWithOptions
-   * @method
-   * @memberof Core/Client
-   * @param {Object} options options to pass to query
-   * @returns {Object} package settings with options
-   */
-  getPackageSettingsWithOptions(options) {
-    const query = options;
-    return Packages.findOne(query);
-  },
-
   /**
    * @name allowGuestCheckout
    * @method
@@ -566,9 +492,10 @@ export default {
    * @returns {Boolean} is guest checkout allowed
    */
   allowGuestCheckout() {
-    const settings = this.getShopSettings();
+    const pkg = Packages.findOne({ name: "core", shopId: this.getShopId() }) || {};
+    const shopSettings = pkg.settings || {};
     // we can disable in admin, let's check.
-    return !!(settings.public && settings.public.allowGuestCheckout);
+    return !!(shopSettings.public && shopSettings.public.allowGuestCheckout);
   },
 
   /**
@@ -917,22 +844,5 @@ export default {
     }
     Logger.debug("getRegistryForCurrentRoute not found", template, provides);
     return {};
-  },
-
-  /**
-   * @name getMarketplaceSettings
-   * @method
-   * @memberof Core/Client
-   * @summary finds the enabled `reaction-marketplace` package for the primary shop and returns the settings
-   * @returns {Object} The marketplace settings from the primary shop or undefined
-   */
-  getMarketplaceSettings() {
-    const marketplaceSettings = Packages.findOne({
-      name: "reaction-marketplace",
-      shopId: this.getPrimaryShopId(), // the primary shop always owns the marketplace settings
-      enabled: true // only use the marketplace settings if marketplace is enabled
-    });
-
-    return marketplaceSettings && marketplaceSettings.settings;
   }
 };
diff --git a/client/modules/core/subscriptions.js b/client/modules/core/subscriptions.js
index 29086491cd..2f4994c894 100644
--- a/client/modules/core/subscriptions.js
+++ b/client/modules/core/subscriptions.js
@@ -1,8 +1,4 @@
-import { Meteor } from "meteor/meteor";
-import { Tracker } from "meteor/tracker";
 import { SubsManager } from "meteor/meteorhacks:subs-manager";
-import Reaction from "./main";
-import { getUserId } from "./helpers/utils";
 
 export const Subscriptions = {};
 
@@ -14,28 +10,8 @@ Subscriptions.Manager = new SubsManager();
  * General Subscriptions
  */
 
-Tracker.autorun(() => {
-  const userId = getUserId();
-  Subscriptions.Account = Subscriptions.Manager.subscribe("Accounts");
-  Subscriptions.UserProfile = Meteor.subscribe("UserProfile", userId);
-});
-
-// Primary shop subscription
-Subscriptions.PrimaryShop = Subscriptions.Manager.subscribe("PrimaryShop");
-
-// This Packages subscription is used for the Active shop's packages
-Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages");
-
-Subscriptions.Groups = Subscriptions.Manager.subscribe("Groups");
-
 Subscriptions.BrandAssets = Subscriptions.Manager.subscribe("BrandAssets");
-
-Tracker.autorun(() => {
-  // Reload Packages sub if shopId changes
-  // We have a persistent subscription to the primary shop's packages,
-  // so don't refresh sub if we're updating to primaryShopId sub
-  const shopId = Reaction.getShopId();
-  if (shopId && shopId !== Reaction.getPrimaryShopId()) {
-    Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages", shopId);
-  }
-});
+Subscriptions.Groups = Subscriptions.Manager.subscribe("Groups");
+Subscriptions.MyAccount = Subscriptions.Manager.subscribe("MyAccount");
+Subscriptions.PrimaryShop = Subscriptions.Manager.subscribe("PrimaryShop");
+Subscriptions.UserProfile = Subscriptions.Manager.subscribe("UserProfile");
diff --git a/imports/client/ui/components/ProfileImageWithData/ProfileImageWithData.js b/imports/client/ui/components/ProfileImageWithData/ProfileImageWithData.js
index 9d4a547c40..f7caf67afa 100644
--- a/imports/client/ui/components/ProfileImageWithData/ProfileImageWithData.js
+++ b/imports/client/ui/components/ProfileImageWithData/ProfileImageWithData.js
@@ -73,7 +73,7 @@ class ProfileImageWithData extends Component {
                 open={Boolean(menuAnchorEl)}
                 onClose={() => setMenuAnchorEl(null)}
               >
-                <Link to={"/operator/profile"}>
+                <Link to={"/profile"}>
                   <MenuItem>{i18next.t("admin.userAccountDropdown.profileLabel")}</MenuItem>
                 </Link>
                 <MenuItem onClick={() => Meteor.logout()}>{i18next.t("accountsUI.signOut")}</MenuItem>
diff --git a/imports/client/ui/components/ShopLogoWithData/ShopLogoWithData.js b/imports/client/ui/components/ShopLogoWithData/ShopLogoWithData.js
index 7316c320da..9b026b87c3 100644
--- a/imports/client/ui/components/ShopLogoWithData/ShopLogoWithData.js
+++ b/imports/client/ui/components/ShopLogoWithData/ShopLogoWithData.js
@@ -125,7 +125,7 @@ ShopLogoWithData.propTypes = {
 };
 
 ShopLogoWithData.defaultProps = {
-  linkTo: "/operator",
+  linkTo: "/",
   shouldShowShopName: false,
   size: 60
 };
diff --git a/imports/client/ui/components/Sidebar/Sidebar.js b/imports/client/ui/components/Sidebar/Sidebar.js
index 6eec1c601a..80da95a21e 100644
--- a/imports/client/ui/components/Sidebar/Sidebar.js
+++ b/imports/client/ui/components/Sidebar/Sidebar.js
@@ -17,6 +17,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 import SettingsIcon from "mdi-material-ui/Settings";
 import CloseIcon from "mdi-material-ui/Close";
 import { Translation } from "/imports/plugins/core/ui/client/components";
+import useIsAppLoading from "/imports/client/ui/hooks/useIsAppLoading.js";
 import useCurrentShopId from "../../hooks/useCurrentShopId";
 import ShopLogoWithData from "../ShopLogoWithData";
 
@@ -107,6 +108,7 @@ function Sidebar(props) {
     routes
   } = props;
 
+  const [isAppLoading] = useIsAppLoading();
   const [currentShopId] = useCurrentShopId();
 
   const primaryRoutes = routes.filter(({ isNavigationLink, isSetting }) => isNavigationLink && !isSetting).sort(routeSort);
@@ -133,14 +135,14 @@ function Sidebar(props) {
   }
 
   let list;
-  if (currentShopId) {
+  if (!isAppLoading && currentShopId) {
     list = (
       <List disablePadding>
         {primaryRoutes.map((route) => (
           <NavLink
             activeClassName={!isSettingsOpen ? activeClassName : null}
             className={classes.link}
-            to={`/operator${route.path}`}
+            to={route.path}
             key={route.path}
             onClick={() => {
               setIsSettingsOpen(false);
@@ -170,7 +172,7 @@ function Sidebar(props) {
               const [firstRoute] = settingRoutes;
 
               if (firstRoute) {
-                history.push(`/operator${firstRoute.path}`);
+                history.push(firstRoute.path);
               }
             }
             setIsSettingsOpen(!isSettingsOpen);
@@ -192,7 +194,7 @@ function Sidebar(props) {
             <NavLink
               activeClassName={activeClassName}
               className={classes.link}
-              to={`/operator${route.path}`}
+              to={route.path}
               key={route.path}
               onClick={onDrawerClose}
             >
diff --git a/imports/client/ui/hooks/useAuth.js b/imports/client/ui/hooks/useAuth.js
index 19a83a2be8..f9441ed5ee 100644
--- a/imports/client/ui/hooks/useAuth.js
+++ b/imports/client/ui/hooks/useAuth.js
@@ -31,7 +31,7 @@ export default function useAuth() {
       setLoggedIn(!!Reaction.getUserId());
 
       // Attempt to check if we are still loading this data
-      setLoading((hasDashboardAccessForAnyShop !== true && hasDashboardAccessForAnyShop !== false) || !shop);
+      setLoading((hasDashboardAccessForAnyShop !== true && hasDashboardAccessForAnyShop !== false));
 
       if (!hasStorefrontHomeUrl && !isLoading) {
         Logger.warn("Missing storefront home URL. Please set this from the shop settings panel so that customer users can be redirected to your storefront.");
diff --git a/imports/client/ui/hooks/useCurrentInternalShopId.js b/imports/client/ui/hooks/useCurrentInternalShopId.js
new file mode 100644
index 0000000000..4c4fa8384a
--- /dev/null
+++ b/imports/client/ui/hooks/useCurrentInternalShopId.js
@@ -0,0 +1,20 @@
+import { useState, useEffect } from "react";
+import { Tracker } from "meteor/tracker";
+import { Reaction } from "/client/api";
+
+/**
+ * React Hook that gets the globally current shop ID
+ * @return {Array} [currentShopId]
+ */
+export default function useCurrentInternalShopId() {
+  const [currentShopId, setCurrentShopId] = useState(null);
+
+  useEffect(() => {
+    Tracker.autorun(() => {
+      const shop = Reaction.getCurrentShop();
+      setCurrentShopId((shop && shop._id) || null);
+    });
+  });
+
+  return [currentShopId];
+}
diff --git a/imports/client/ui/hooks/useCurrentShopId.js b/imports/client/ui/hooks/useCurrentShopId.js
index 04861f9ead..54414f2796 100644
--- a/imports/client/ui/hooks/useCurrentShopId.js
+++ b/imports/client/ui/hooks/useCurrentShopId.js
@@ -1,20 +1,34 @@
 import { useState, useEffect } from "react";
-import { Tracker } from "meteor/tracker";
-import { Reaction } from "/client/api";
+import Logger from "/client/modules/logger";
+import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
+import useCurrentInternalShopId from "./useCurrentInternalShopId.js";
 
 /**
  * React Hook that gets the globally current shop ID
  * @return {Array} [currentShopId]
  */
 export default function useCurrentShopId() {
+  const [internalShopId] = useCurrentInternalShopId();
   const [currentShopId, setCurrentShopId] = useState(null);
 
   useEffect(() => {
-    Tracker.autorun(() => {
-      const shop = Reaction.getCurrentShop();
-      setCurrentShopId((shop && shop._id) || null);
-    });
-  });
+    let isMounted = true;
+
+    getOpaqueIds([
+      { namespace: "Shop", id: internalShopId }
+    ])
+      .then(([opaqueShopId]) => {
+        if (isMounted) setCurrentShopId(opaqueShopId);
+        return null;
+      })
+      .catch((error) => {
+        Logger.error(error);
+      });
+
+    return () => {
+      isMounted = false;
+    };
+  }, [internalShopId]);
 
   return [currentShopId];
 }
diff --git a/imports/client/ui/hooks/useIsAppLoading.js b/imports/client/ui/hooks/useIsAppLoading.js
new file mode 100644
index 0000000000..fa1940ea8f
--- /dev/null
+++ b/imports/client/ui/hooks/useIsAppLoading.js
@@ -0,0 +1,28 @@
+import { useState, useEffect } from "react";
+import { Tracker } from "meteor/tracker";
+import { Subscriptions } from "/client/modules/core/subscriptions.js";
+
+/**
+ * @summary React Hook used to determine if core app requirements
+ *   like translations are still loading
+ * @return {Array} [isAppLoading]
+ */
+export default function useIsAppLoading() {
+  const [isAppLoading, setIsAppLoading] = useState(null);
+
+  useEffect(() => {
+    Tracker.autorun(() => {
+      const allSubscriptionsReady = (
+        Subscriptions.BrandAssets.ready() &&
+        Subscriptions.Groups.ready() &&
+        Subscriptions.MyAccount.ready() &&
+        Subscriptions.PrimaryShop.ready() &&
+        Subscriptions.UserProfile.ready()
+      );
+
+      setIsAppLoading(!allSubscriptionsReady);
+    });
+  });
+
+  return [isAppLoading];
+}
diff --git a/imports/client/ui/layouts/App.js b/imports/client/ui/layouts/App.js
index ec8c11b238..c351a8189f 100644
--- a/imports/client/ui/layouts/App.js
+++ b/imports/client/ui/layouts/App.js
@@ -2,10 +2,11 @@ import React from "react";
 import Helmet from "react-helmet";
 import { Route, Switch } from "react-router-dom";
 import i18next from "i18next";
+import { Components } from "@reactioncommerce/reaction-components";
 import useAuth from "../hooks/useAuth";
-import useRouter from "../hooks/useRouter";
 import Dashboard from "./Dashboard";
 import { routes } from "/imports/client/ui";
+import useIsAppLoading from "/imports/client/ui/hooks/useIsAppLoading.js";
 import ContentViewFullLayout from "./ContentViewFullLayout";
 import ContentViewStandardLayout from "./ContentViewStandardLayout";
 import DefaultPage from "./DefaultPage";
@@ -15,27 +16,20 @@ import DefaultPage from "./DefaultPage";
  * @returns {React.ReactElement} React component
  */
 function App() {
-  const { isAdmin, isLoggedIn, redirectUrl } = useAuth();
-  const { location } = useRouter();
-
-
-  if (location.pathname === "/") {
-    window.location.replace("/operator");
-  }
-
-  if (isLoggedIn && !isAdmin) {
-    return <DefaultPage />;
-  }
-
-  if (isAdmin && location.pathname.startsWith("/operator")) {
-    return <Dashboard />;
-  }
+  const { isAdmin, isLoading, isLoggedIn, redirectUrl } = useAuth();
+  const [isAppLoading] = useIsAppLoading();
 
   if (redirectUrl) {
     window.location.href = redirectUrl;
     return null;
   }
 
+  if (isLoading || isAppLoading) return <Components.Loading />;
+
+  if (isLoggedIn) {
+    return isAdmin ? <Dashboard /> : <DefaultPage />;
+  }
+
   return (
     <>
       <Switch>
@@ -43,7 +37,7 @@ function App() {
           routes.map((route, index) => (
             <Route
               key={route.path || `app-route-${index}`}
-              path={`${route.path}`}
+              path={route.path}
               exact={route.exact}
               render={(props) => {
                 const title = i18next.t(route.sidebarI18nLabel, { defaultValue: "Reaction Admin" });
diff --git a/imports/client/ui/layouts/Dashboard.js b/imports/client/ui/layouts/Dashboard.js
index cda2032855..44e994e5ab 100644
--- a/imports/client/ui/layouts/Dashboard.js
+++ b/imports/client/ui/layouts/Dashboard.js
@@ -131,7 +131,7 @@ class Dashboard extends Component {
                 <Route
                   exact
                   key={route.path}
-                  path={`/operator${route.path}`}
+                  path={route.path}
                   render={(props) => {
                     const title = i18next.t(route.sidebarI18nLabel, { defaultValue: "Reaction Admin" });
                     // If the layout component is explicitly null
diff --git a/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js b/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
index 85b1a49ec0..d20596120e 100644
--- a/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
+++ b/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
@@ -105,9 +105,12 @@ const handlers = {
 
 const composer = (props, onData) => {
   const shopId = Reaction.getShopId();
+  if (!shopId) return;
+
   const grpSub = Meteor.subscribe("Groups", { shopId });
+  const accountSub = Meteor.subscribe("Accounts");
 
-  if (Reaction.Subscriptions.Account.ready() && grpSub.ready()) {
+  if (accountSub.ready() && grpSub.ready()) {
     const groups = Groups.find({ shopId }).fetch();
     const adminGroups = groups.filter((group) => group.slug !== "customer" && group.slug !== "guest");
 
diff --git a/imports/plugins/core/accounts/client/containers/editGroupContainer.js b/imports/plugins/core/accounts/client/containers/editGroupContainer.js
index 1c4afa716a..b67f6c8b9e 100644
--- a/imports/plugins/core/accounts/client/containers/editGroupContainer.js
+++ b/imports/plugins/core/accounts/client/containers/editGroupContainer.js
@@ -6,8 +6,10 @@ import EditGroup from "../components/editGroup";
 
 const composer = (props, onData) => {
   const shopId = Reaction.getShopId();
-  const pkg = Meteor.subscribe("Packages", shopId);
-  if (pkg.ready()) {
+  if (!shopId) return;
+
+  const pkgSub = Meteor.subscribe("Packages", shopId);
+  if (pkgSub.ready()) {
     const packages = Packages.find({ shopId }).fetch();
     onData(null, { packages, ...props });
   }
diff --git a/imports/plugins/core/accounts/client/containers/updatePassword.js b/imports/plugins/core/accounts/client/containers/updatePassword.js
index 0aac93fea4..d67aff5802 100644
--- a/imports/plugins/core/accounts/client/containers/updatePassword.js
+++ b/imports/plugins/core/accounts/client/containers/updatePassword.js
@@ -83,7 +83,7 @@ const wrapComponent = (Comp) => (
           const { storefrontUrls } = Reaction.getCurrentShop();
 
           if (Reaction.hasDashboardAccessForAnyShop()) {
-            this.props.history("/operator");
+            this.props.history("/");
           } else if (!storefrontUrls || !storefrontUrls.storefrontLoginUrl) {
             throw new ReactionError("error-occurred", "Missing storefront URLs. Please set these properties from the shop settings panel.");
           } else {
diff --git a/imports/plugins/core/accounts/client/templates/members/member.js b/imports/plugins/core/accounts/client/templates/members/member.js
index 305c2c9cd5..2988a03432 100644
--- a/imports/plugins/core/accounts/client/templates/members/member.js
+++ b/imports/plugins/core/accounts/client/templates/members/member.js
@@ -134,20 +134,6 @@ Template.memberSettings.helpers({
     return Boolean(permissions.length);
   },
 
-  /**
-   * showAvalaraTaxSettings
-   * @returns {Boolean} True if avalara is enabled. Defaults to false if not found
-   * @ignore
-   */
-  showAvalaraTaxSettings() {
-    const avalara = Packages.findOne({
-      name: "taxes-avalara",
-      shopId: Reaction.getShopId()
-    });
-
-    return _.get(avalara, "settings.avalara.enabled", false);
-  },
-
   accountsDetail() {
     return {
       component: AccountsDashboard
diff --git a/imports/plugins/core/core/server/Reaction/core.js b/imports/plugins/core/core/server/Reaction/core.js
index 4dd0abaacc..fdd52ce89b 100644
--- a/imports/plugins/core/core/server/Reaction/core.js
+++ b/imports/plugins/core/core/server/Reaction/core.js
@@ -224,16 +224,6 @@ export default {
     }, []);
   },
 
-  /**
-   * @name getSellerShopId
-   * @method
-   * @memberof Core
-   * @returns {String} Shop ID
-   */
-  getSellerShopId() {
-    return Roles.getGroupsForUser(this.userId, "admin");
-  },
-
   /**
    * @name getPrimaryShop
    * @summary Get the first created shop. In marketplace, the Primary Shop is the shop that controls the marketplace
@@ -293,21 +283,6 @@ export default {
     return `/${this.getSlug(this.getPrimaryShopName().toLowerCase())}`;
   },
 
-  /**
-   * @name getPrimaryShopSettings
-   * @method
-   * @memberof Core
-   * @summary Get primary shop settings object
-   * @returns {Object} Get settings object or empty object
-   */
-  getPrimaryShopSettings() {
-    const settings = Packages.findOne({
-      name: "core",
-      shopId: this.getPrimaryShopId()
-    }) || {};
-    return settings.settings || {};
-  },
-
   /**
    * @summary **DEPRECATED** This method has been deprecated in favor of using getShopId
    * and getPrimaryShopId. To be removed.
@@ -377,9 +352,6 @@ export default {
 
     // use the primary shop id by default
     if (!shopId) {
-      const domain = this.connectionDomain();
-      Logger.warn(`No shop matching domain '${domain}'. Defaulting to Primary Shop.`);
-
       shopId = this.getPrimaryShopId();
     }
 
@@ -459,172 +431,6 @@ export default {
     return _.get(user, "profile.preferences.reaction.activeShopId");
   },
 
-  /**
-   * @name getCartShopId
-   * @method
-   * @memberof Core
-   * @summary Get the correct shop ID to use for Cart collection
-   * @returns {StringId} The primary or current shop ID, depending on merchantCart setting
-   */
-  getCartShopId() {
-    const marketplaceSettings = this.getMarketplaceSettings();
-    let shopId;
-    if (marketplaceSettings && marketplaceSettings.public && marketplaceSettings.public.merchantCart) {
-      shopId = this.getShopId();
-    } else {
-      shopId = this.getPrimaryShopId();
-    }
-    return shopId;
-  },
-
-  /**
-   * @name getShopName
-   * @method
-   * @memberof Core
-   * @summary If we can't find the shop or shop name return an empty string
-   * @returns {String} Shop name or empty string ""
-   */
-  getShopName() {
-    const shopId = this.getShopId();
-    let shop;
-    if (shopId) {
-      shop = Shops.findOne({
-        _id: shopId
-      }, {
-        fields: {
-          name: 1
-        }
-      });
-    } else {
-      const domain = this.getDomain();
-      shop = Shops.findOne({
-        domains: domain
-      }, {
-        fields: {
-          name: 1
-        }
-      });
-    }
-    if (shop && shop.name) {
-      return shop.name;
-    }
-    return "";
-  },
-
-  /**
-   * @name getShopEmail
-   * @method
-   * @memberof Core
-   * @summary Get shop email
-   * @returns {String} String with the first store email
-   */
-  getShopEmail() {
-    const shop = Shops.find({
-      _id: this.getShopId()
-    }, {
-      limit: 1,
-      fields: {
-        emails: 1
-      }
-    }).fetch()[0];
-    return shop && shop.emails && shop.emails[0].address;
-  },
-
-  /**
-   * @name getShopSettings
-   * @method
-   * @memberof Core
-   * @summary Get shop settings object
-   * @param  {String} [name="core"] Package name
-   * @returns {Object}               Shop settings object or empty object
-   */
-  getShopSettings(name = "core") {
-    const settings = Packages.findOne({ name, shopId: this.getShopId() }) || {};
-    return settings.settings || {};
-  },
-
-  /**
-   * @name getShopCurrency
-   * @method
-   * @memberof Core
-   * @summary Get shop currency
-   * @returns {String} Shop currency or "USD"
-   */
-  getShopCurrency() {
-    const shop = Shops.findOne({
-      _id: this.getShopId()
-    });
-
-    return (shop && shop.currency) || "USD";
-  },
-
-  /**
-   * @name getShopCurrencies
-   * @method
-   * @memberof Core
-   * @summary Get all currencies available to a shop
-   * @returns {Object} Shop currency or "USD"
-   */
-  getShopCurrencies() {
-    const shop = Shops.findOne({
-      _id: this.getShopId()
-    });
-
-    return shop && shop.currencies;
-  },
-
-  /**
-   * @name getShopLanguage
-   * @method
-   * @memberof Core
-   * @todo TODO: Marketplace - should each shop set their own default language or
-   * should the Marketplace set a language that's picked up by all shops?
-   * @returns {String} language
-   */
-  getShopLanguage() {
-    const { language } = Shops.findOne({
-      _id: this.getShopId()
-    }, {
-      fields: {
-        language: 1
-      }
-    });
-    return language;
-  },
-
-  /**
-   * @name getPackageSettings
-   * @method
-   * @memberof Core
-   * @summary Get package settings
-   * @param  {String} name Package name
-   * @returns {Object|null}      Package setting object or null
-   */
-  getPackageSettings(name) {
-    return Packages.findOne({ name, shopId: this.getShopId() }) || null;
-  },
-
-  /**
-   * @name getMarketplaceSettings
-   * @method
-   * @memberof Core
-   * @summary finds the enabled `reaction-marketplace` package for
-   * the primary shop and returns the settings
-   * @returns {Object} The marketplace settings from the primary shop or undefined
-   */
-  getMarketplaceSettings() {
-    const marketplace = Packages.findOne({
-      name: "reaction-marketplace",
-      shopId: this.getPrimaryShopId(),
-      enabled: true
-    });
-
-    if (marketplace && marketplace.settings) {
-      return marketplace.settings;
-    }
-    return {};
-  },
-
   /**
    * @summary Method for getting all schemas attached to a given collection
    * @deprecated by simpl-schema
diff --git a/imports/plugins/core/core/server/methods/shop/createShop.js b/imports/plugins/core/core/server/methods/shop/createShop.js
deleted file mode 100644
index 6871f9d66c..0000000000
--- a/imports/plugins/core/core/server/methods/shop/createShop.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import Logger from "@reactioncommerce/logger";
-import { check, Match } from "meteor/check";
-import { Meteor } from "meteor/meteor";
-import { Accounts, Shops } from "/lib/collections";
-import * as Schemas from "/lib/collections/schemas";
-import { Reaction } from "/lib/api";
-import appEvents from "/imports/temp-utils/appEvents.js";
-import ReactionError from "@reactioncommerce/reaction-error";
-import getSlug from "/imports/plugins/core/core/server/Reaction/getSlug";
-
-/**
- * @name cloneShop
- * @summary Returns an existing shop object, with some values removed or changed such
- *   that it is suitable for inserting as a new shop.
- * @method
- * @param {Object} shop - the shop to clone
- * @param {Object} partialShopData - any properties you'd like to override
- * @returns {Object|null} The cloned shop object or null if a shop with that ID can't be found
- * @private
- */
-function cloneShop(shop, partialShopData = {}) {
-  // if a name is not provided, generate a unique name
-  if (!partialShopData || !partialShopData.name) {
-    const count = Shops.find().count() || "";
-    shop.name += count;
-  }
-
-  // merge in the partial shop data and some other current user attributes
-  Object.assign(shop, partialShopData || {});
-
-  const cleanShop = Schemas.Shop.clean(shop);
-
-  // Never create a second primary shop
-  if (!cleanShop.shopType || cleanShop.shopType === "primary") {
-    cleanShop.shopType = "merchant";
-  }
-
-  // Clean up values that get automatically added
-  delete cleanShop._id;
-  delete cleanShop.createdAt;
-  delete cleanShop.updatedAt;
-  delete cleanShop.slug;
-  // TODO audience permissions need to be consolidated into [object] and not [string]
-  // permissions with [string] on layout ie. orders and checkout, cause the insert to fail
-  delete cleanShop.layout;
-  // delete brandAssets object from shop to prevent new shops from carrying over existing shop's
-  // brand image
-  delete cleanShop.brandAssets;
-
-  return cleanShop;
-}
-
-/**
- * @name shop/createShop
- * @method
- * @memberof Shop/Methods
- * @param {String} shopAdminUserId - optionally create shop for provided userId
- * @param {Object} partialShopData - optionally provide a subset of shop data
- *                 which will be merged with properties from the primary shop
- *                 in order to create a document which meets the Shops schema
- *                 requirements.
- * @returns {String} return shopId
- */
-export default function createShop(shopAdminUserId, partialShopData) {
-  check(shopAdminUserId, Match.Optional(String));
-  // It is not necessary to test whether shopData is valid against the Shops
-  // schema here, as shopData can be a subset of data. Later, shopData is
-  // combined with a copy of the Primary Shop to fill in the gaps. It is at
-  // that point that we validate/`check` that the combined object is valid
-  // against the Shops schema.
-  check(partialShopData, Match.Maybe(Object));
-
-  // Get the current marketplace settings
-  const marketplace = Reaction.getMarketplaceSettings();
-  const userId = Reaction.getUserId();
-
-  // check to see if the current user has owner permissions for the primary shop
-  const hasPrimaryShopOwnerPermission = Reaction.hasPermission("owner", userId, Reaction.getPrimaryShopId());
-
-  // only permit merchant signup if marketplace is enabled and allowMerchantSignup is enabled
-  let allowMerchantShopCreation = false;
-  if (marketplace && marketplace.enabled && marketplace.public && marketplace.public.allowMerchantSignup) {
-    allowMerchantShopCreation = true;
-  }
-
-  // must have owner access to create new shops when marketplace is disabled
-  if (!hasPrimaryShopOwnerPermission && !allowMerchantShopCreation) {
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-
-  // Non-admin users may only create shops for themselves
-  if (!hasPrimaryShopOwnerPermission && shopAdminUserId !== userId) {
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-
-  // Anonymous users should never be permitted to create a shop
-  if (!hasPrimaryShopOwnerPermission &&
-      Reaction.hasPermission("anonymous", userId, Reaction.getPrimaryShopId())) {
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-
-  const currentUser = Meteor.users.findOne({ _id: userId });
-  const currentAccount = Accounts.findOne({ userId });
-  if (!currentUser || !currentAccount) {
-    throw new ReactionError("server-error", "Unable to create shop without a user");
-  }
-
-  let shopUser = currentUser;
-  let shopAccount = currentAccount;
-  // TODO: Create a grantable permission for creating shops so we can decouple ownership from shop creation
-  // Only marketplace owners can create shops for others
-  if (hasPrimaryShopOwnerPermission) {
-    shopUser = Meteor.users.findOne({ _id: shopAdminUserId }) || currentUser;
-    shopAccount = Accounts.findOne({ _id: shopAdminUserId }) || currentAccount;
-  }
-
-  const primaryShopId = Reaction.getPrimaryShopId();
-
-  // Disallow creation of multiple shops, even for marketplace owners
-  if (shopAccount.shopId !== primaryShopId) {
-    throw new ReactionError(
-      "operation-not-permitted",
-      "This user already has a shop. Each user may only have one shop."
-    );
-  }
-
-  const shop = cloneShop(Reaction.getPrimaryShop(), partialShopData);
-
-  shop.emails = shopUser.emails;
-  shop.addressBook = shopAccount.addressBook;
-  shop.slug = getSlug(shop.name);
-
-  Shops.simpleSchema(shop).validate(shop);
-
-  let newShopId;
-
-  try {
-    newShopId = Shops.insert(shop);
-  } catch (error) {
-    return Logger.error(error, "Failed to shop/createShop");
-  }
-
-  const newShop = Shops.findOne({ _id: newShopId });
-
-  // we should have created new shop, or erred
-  Logger.info("Created shop: ", newShopId);
-
-  Promise.await(appEvents.emit("afterShopCreate", { createdBy: userId, shop: newShop, shopAdminUserId: shopAdminUserId || userId }));
-
-  // Add this shop to the merchant
-  Shops.update({ _id: primaryShopId }, {
-    $addToSet: {
-      merchantShops: {
-        _id: newShopId,
-        slug: newShop.slug,
-        name: newShop.name
-      }
-    }
-  });
-
-  // Set active shop to new shop.
-  return { shopId: newShopId };
-}
diff --git a/imports/plugins/core/core/server/methods/shop/index.js b/imports/plugins/core/core/server/methods/shop/index.js
index 06c5f3dd43..14a1497daa 100644
--- a/imports/plugins/core/core/server/methods/shop/index.js
+++ b/imports/plugins/core/core/server/methods/shop/index.js
@@ -1,4 +1,3 @@
-import createShop from "./createShop";
 import createTag from "./createTag";
 import locateAddress from "./locateAddress";
 import togglePackage from "./togglePackage";
@@ -17,7 +16,6 @@ import updateShopExternalServices from "./updateShopExternalServices";
 */
 
 export default {
-  "shop/createShop": createShop,
   "shop/createTag": createTag,
   "shop/locateAddress": locateAddress,
   "shop/togglePackage": togglePackage,
diff --git a/imports/plugins/core/core/server/publications/collections/accounts.js b/imports/plugins/core/core/server/publications/collections/accounts.js
index ed8a6e14c1..30629aa1a0 100644
--- a/imports/plugins/core/core/server/publications/collections/accounts.js
+++ b/imports/plugins/core/core/server/publications/collections/accounts.js
@@ -8,7 +8,7 @@ import Reaction from "/imports/plugins/core/core/server/Reaction";
  * accounts
  */
 
-Meteor.publish("Accounts", function () {
+Meteor.publish("Accounts", function publishAccounts() {
   const userId = Reaction.getUserId();
 
   if (!userId) {
@@ -45,11 +45,21 @@ Meteor.publish("Accounts", function () {
   return Collections.Accounts.find({ userId });
 });
 
+/**
+ * Own account
+ */
+Meteor.publish("MyAccount", function publishMyAccount() {
+  const userId = Reaction.getUserId();
+  if (!userId) return this.ready();
+
+  return Collections.Accounts.find({ userId });
+});
+
 /**
  * Single account
  * @param {String} userId -  id of user to find
  */
-Meteor.publish("UserAccount", function (userId) {
+Meteor.publish("UserAccount", function publishUserAccount(userId) {
   check(userId, Match.OneOf(String, null));
 
   const shopId = Reaction.getShopId();
@@ -69,19 +79,11 @@ Meteor.publish("UserAccount", function (userId) {
  * users with permissions  ["dashboard/orders", "owner", "admin", "dashboard/
  * customers"] may view the profileUserId"s profile data.
  *
- * @param {String} profileUserId -  view this users profile when permitted
  */
-Meteor.publish("UserProfile", function (profileUserId) {
-  check(profileUserId, Match.OneOf(String, null));
-  if (this.userId === null) {
-    return this.ready();
-  }
-  const shopId = Reaction.getShopId();
-  if (!shopId) {
-    return this.ready();
-  }
-  const permissions = ["dashboard/orders", "owner", "admin",
-    "dashboard/customers"];
+Meteor.publish("UserProfile", function publishUserProfile() {
+  const userId = Reaction.getUserId();
+  if (!userId) return this.ready();
+
   // no need to normal user so see his password hash
   const fields = {
     "emails": 1,
@@ -98,26 +100,6 @@ Meteor.publish("UserProfile", function (profileUserId) {
     "services.github.username": 1,
     "services.instagram.profile_picture": 1
   };
-  // TODO: this part currently not working as expected.
-  // we could have three situation here:
-  // 1 - registered user log in.
-  // 2 - admin log in
-  // 3 - admin want to get user data
-  // I'm not sure about the 3rd case, but we do not cover 2nd case here, because
-  // we can see a situation when anonymous user still represented by
-  // `profileUserId`, but admin user already could be found by `this.userId`
-  // In that case what we should do here?
-  if (profileUserId !== this.userId && Roles.userIsInRole(
-    this.userId,
-    permissions, shopId ||
-    Roles.userIsInRole(this.userId, permissions, Roles.GLOBAL_GROUP)
-  )) {
-    return Meteor.users.find({
-      _id: profileUserId
-    }, {
-      fields
-    });
-  }
 
   return Meteor.users.find({
     _id: this.userId
diff --git a/imports/plugins/core/dashboard/client/components/CreateFirstShopForm.js b/imports/plugins/core/dashboard/client/components/CreateFirstShopForm.js
index 59112e9a9e..1216f72004 100644
--- a/imports/plugins/core/dashboard/client/components/CreateFirstShopForm.js
+++ b/imports/plugins/core/dashboard/client/components/CreateFirstShopForm.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import PropTypes from "prop-types";
 import SimpleSchema from "simpl-schema";
 import Button from "@reactioncommerce/catalyst/Button";
@@ -31,6 +31,7 @@ function CreateFirstShopForm(props) {
   const { onSubmit } = props;
 
   const classes = useStyles();
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const {
     getFirstErrorMessage,
@@ -38,7 +39,11 @@ function CreateFirstShopForm(props) {
     hasErrors,
     submitForm
   } = useReactoForm({
-    onSubmit,
+    async onSubmit(...args) {
+      setIsSubmitting(true);
+      await onSubmit(...args);
+      setIsSubmitting(false);
+    },
     validator
   });
 
@@ -55,7 +60,15 @@ function CreateFirstShopForm(props) {
         }}
         {...getInputProps("name", muiOptions)}
       />
-      <Button color="primary" variant="contained" fullWidth onClick={submitForm}>Submit</Button>
+      <Button
+        color="primary"
+        fullWidth
+        isDisabled={isSubmitting}
+        onClick={submitForm}
+        variant="contained"
+      >
+        {isSubmitting ? "Creating Shop..." : "Create Shop"}
+      </Button>
     </div>
   );
 }
diff --git a/imports/plugins/core/dashboard/client/components/OperatorLanding.js b/imports/plugins/core/dashboard/client/components/OperatorLanding.js
index 3b81a5977c..695eb6f43b 100644
--- a/imports/plugins/core/dashboard/client/components/OperatorLanding.js
+++ b/imports/plugins/core/dashboard/client/components/OperatorLanding.js
@@ -10,6 +10,7 @@ import Typography from "@material-ui/core/Typography";
 import { Components } from "@reactioncommerce/reaction-components";
 import { i18next } from "/client/api";
 import ShopLogoWithData from "/imports/client/ui/components/ShopLogoWithData/ShopLogoWithData";
+import useIsAppLoading from "/imports/client/ui/hooks/useIsAppLoading.js";
 import useCurrentShopId from "/imports/client/ui/hooks/useCurrentShopId.js";
 
 /**
@@ -18,8 +19,11 @@ import useCurrentShopId from "/imports/client/ui/hooks/useCurrentShopId.js";
  * @returns {Node} React component
  */
 function OperatorLanding() {
+  const [isAppLoading] = useIsAppLoading();
   const [currentShopId] = useCurrentShopId();
 
+  if (isAppLoading) return <Components.Loading />;
+
   let content;
   if (currentShopId) {
     content = (
@@ -27,7 +31,7 @@ function OperatorLanding() {
         <Grid item>
           <Typography align="center" variant="body1">
             {/* eslint-disable-next-line max-len */}
-            Use Reaction Admin to manage <Link to="/operator/orders">Orders</Link>, <Link to="/operator/products">Products</Link>, <Link to="/operator/tags">Tags</Link>, <Link to="/operator/accounts">Accounts</Link>, and <Link to="/operator/navigation">Navigation</Link>, or change shop settings.
+            Use Reaction Admin to manage <Link to="/orders">Orders</Link>, <Link to="/products">Products</Link>, <Link to="/tags">Tags</Link>, <Link to="/accounts">Accounts</Link>, and <Link to="/navigation">Navigation</Link>, or change shop settings.
           </Typography>
         </Grid>
         <Grid item>
diff --git a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
index 9c8dbb4c09..51411095a6 100644
--- a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
+++ b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
@@ -29,6 +29,13 @@ Template.shopSettings.onCreated(function onCreated() {
         Logger.error(error);
       });
   });
+
+  this.autorun(async () => {
+    const shopId = Reaction.getShopId();
+    if (shopId) {
+      this.subscribe("Packages", shopId);
+    }
+  });
 });
 
 /**
@@ -71,11 +78,6 @@ Template.shopSettings.helpers({
       return false;
     }
 
-    if (Reaction.getMarketplaceSettings()) {
-      // if marketplace is enabled, only the primary shop can switch apps on and off.
-      return Reaction.getShopId() === Reaction.getPrimaryShopId();
-    }
-
     // If marketplace is disabled, every shop can switch apps
     return true;
   },
@@ -166,9 +168,5 @@ Template.optionsShopSettings.helpers({
       name: "core",
       shopId: Reaction.getShopId()
     });
-  },
-
-  isPackageEnabled(name) {
-    return Reaction.isPackageEnabled(name);
   }
 });
diff --git a/imports/plugins/core/email/client/components/EmailConfig.js b/imports/plugins/core/email/client/components/EmailConfig.js
deleted file mode 100644
index 688e9b0b9e..0000000000
--- a/imports/plugins/core/email/client/components/EmailConfig.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components } from "@reactioncommerce/reaction-components";
-
-export default class EmailConfig extends Component {
-  static propTypes = {
-    configComponentName: PropTypes.string
-  };
-
-  render() {
-    const { configComponentName } = this.props;
-
-    let ConfigComponent;
-    if (configComponentName) {
-      ConfigComponent = Components[configComponentName];
-    }
-
-    return (
-      <Components.CardGroup>
-        <Components.Card>
-          <Components.CardHeader
-            actAsExpander={true}
-            i18nKeyTitle="admin.settings.mailProvider"
-            title="Mail Provider"
-          />
-          <Components.CardBody expandable={true}>
-            {ConfigComponent && (<ConfigComponent />)}
-          </Components.CardBody>
-        </Components.Card>
-      </Components.CardGroup>
-    );
-  }
-}
diff --git a/imports/plugins/core/email/client/containers/EmailConfigContainer.js b/imports/plugins/core/email/client/containers/EmailConfigContainer.js
deleted file mode 100644
index e3710c23bd..0000000000
--- a/imports/plugins/core/email/client/containers/EmailConfigContainer.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* eslint-disable react/no-did-mount-set-state */
-/* TODO: revisit this component and convert to functional component to remove need for state */
-import React, { Component, Fragment } from "react";
-import { Reaction } from "/client/api";
-import EmailConfig from "../components/EmailConfig";
-
-export default class EmailConfigContainer extends Component {
-  state = {
-    configComponentName: ""
-  };
-
-  componentDidMount() {
-    // Load plugins that provide an email provider config component
-    let emailProviderPlugins = Reaction.Apps({ provides: "emailProviderConfig" });
-
-    // If more then one plugin provides emailProviderConfig, use first non-core plugin (core is reaction-email-smtp)
-    let emailProviderPlugin;
-    if (emailProviderPlugins && emailProviderPlugins.length) {
-      if (emailProviderPlugins.length === 1) {
-        [emailProviderPlugin] = emailProviderPlugins;
-      } else {
-        emailProviderPlugins = emailProviderPlugins.filter((plugin) => plugin.packageName !== "reaction-email-smtp");
-        [emailProviderPlugin] = emailProviderPlugins;
-      }
-    }
-
-    if (emailProviderPlugin) {
-      const { template: configComponentName } = emailProviderPlugin;
-      this.setState({ configComponentName });
-    }
-  }
-
-  render() {
-    const { configComponentName } = this.state;
-    return (
-      <Fragment>
-        <EmailConfig configComponentName={configComponentName} />
-      </Fragment>
-    );
-  }
-}
diff --git a/imports/plugins/core/email/client/containers/EmailSettings.js b/imports/plugins/core/email/client/containers/EmailSettings.js
index a3f143655f..e3098c09dc 100644
--- a/imports/plugins/core/email/client/containers/EmailSettings.js
+++ b/imports/plugins/core/email/client/containers/EmailSettings.js
@@ -1,5 +1,5 @@
 import React, { Component, Fragment } from "react";
-import EmailConfig from "./EmailConfigContainer";
+import { Blocks } from "@reactioncommerce/reaction-components";
 import EmailLogs from "./emailLogs";
 
 export default class EmailSettings extends Component {
@@ -7,7 +7,7 @@ export default class EmailSettings extends Component {
     return (
       <Fragment>
         <div>
-          <EmailConfig />
+          <Blocks region="EmailSettings" />
         </div>
         <div>
           <EmailLogs />
diff --git a/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.js b/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.js
index 87b6406595..5175d75235 100644
--- a/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.js
+++ b/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.js
@@ -1,42 +1,28 @@
 import React from "react";
-import PropTypes from "prop-types";
-import { Query } from "react-apollo";
-import getPrimaryShopId from "../queries/getPrimaryShopId";
+import useCurrentShopId from "../../../../../client/ui/hooks/useCurrentShopId";
 
-export default (Component) => (
-  class PrimaryShopId extends React.Component {
-    static propTypes = {
-      shouldSkipGraphql: PropTypes.bool // Whether to skip this HOC's GraphQL query & data
-    };
+/**
+ * @summary withPrimaryShopId HOC wrapper
+ * @deprecated Function components should use `useCurrentShopId` hook directly
+ * @param {React.Component} Component React component
+ * @return {Function} HOC
+ */
+function withPrimaryShopId(Component) {
+  /**
+ * @summary WithPrimaryShopId HOC
+ * @deprecated Function components should use `useCurrentShopId` hook directly
+ * @param {Object} props React props
+ * @return {Object} Rendered component instance
+ */
+  function WithPrimaryShopId(props) {
+    const [shopId] = useCurrentShopId();
 
-    render() {
-      const { shouldSkipGraphql } = this.props;
-
-      if (shouldSkipGraphql) {
-        return (
-          <Component {...this.props} />
-        );
-      }
-
-      return (
-        <Query query={getPrimaryShopId}>
-          {({ loading, data }) => {
-            const props = {
-              ...this.props,
-              isLoadingPrimaryShopId: loading
-            };
+    return (
+      <Component {...props} shopId={shopId} />
+    );
+  }
 
-            if (!loading && data) {
-              const { primaryShopId } = data;
-              props.shopId = primaryShopId;
-            }
+  return WithPrimaryShopId;
+}
 
-            return (
-              <Component {...props} />
-            );
-          }}
-        </Query>
-      );
-    }
-  }
-);
+export default withPrimaryShopId;
diff --git a/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.test.js b/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.test.js
deleted file mode 100644
index cea94d7a30..0000000000
--- a/imports/plugins/core/graphql/lib/hocs/withPrimaryShopId.test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from "react";
-import { act } from "react-dom/test-utils";
-import { mount } from "enzyme";
-import { MockedProvider } from "@apollo/react-testing";
-import waitForFalseyProp from "/imports/test-utils/helpers/waitForFalseyProp";
-import getPrimaryShopId from "../queries/getPrimaryShopId";
-import withPrimaryShopId from "./withPrimaryShopId";
-
-const fakeOpaqueShopId = "cmVhY3Rpb24vc2hvcDpKOEJocTN1VHRkZ3daeDNyeg==";
-const MockComponent = () => <div>Mock</div>;
-const TestComponent = withPrimaryShopId(MockComponent);
-
-test("renders child component with correct shop id", async () => {
-  const mocks = [{
-    request: { query: getPrimaryShopId },
-    result: {
-      data: {
-        primaryShopId: fakeOpaqueShopId
-      }
-    }
-  }];
-
-  let wrapper;
-  act(() => {
-    wrapper = mount(<MockedProvider mocks={mocks}>
-      <TestComponent />
-    </MockedProvider>);
-  });
-
-  await waitForFalseyProp(wrapper, "MockComponent", "isLoadingPrimaryShopId");
-
-  expect(wrapper.find("MockComponent").prop("shopId")).toBe(fakeOpaqueShopId);
-});
diff --git a/imports/plugins/core/layout/client/components/coreLayout.js b/imports/plugins/core/layout/client/components/coreLayout.js
index 630eb76d4e..be3a32cef0 100644
--- a/imports/plugins/core/layout/client/components/coreLayout.js
+++ b/imports/plugins/core/layout/client/components/coreLayout.js
@@ -45,12 +45,6 @@ function CoreLayout({ classes, isAdmin, isLoading, isLoggedIn, location, storefr
   // If we're not on /account or /account/login for hydra, and the user is signed in,
   // then we will redirect or show a logout button
   if (!location.pathname.startsWith("/account") && !location.pathname.startsWith("/reset")) {
-    // If the current user is an admin then redirect to /operator
-    if (!location.pathname.startsWith("/operator") && isAdmin) {
-      window.location.replace("/operator");
-      return null;
-    }
-
     // If the user is logged in, which makes them no longer anonymous
     // But they aren't an admin, then give them a logout button.
     if (isLoggedIn && !isAdmin) {
diff --git a/imports/plugins/core/layout/server/publications/templates.js b/imports/plugins/core/layout/server/publications/templates.js
index 33ec92d703..49b1ee096c 100644
--- a/imports/plugins/core/layout/server/publications/templates.js
+++ b/imports/plugins/core/layout/server/publications/templates.js
@@ -1,42 +1,12 @@
 import { Meteor } from "meteor/meteor";
-import { check, Match } from "meteor/check";
 import { Counts } from "meteor/tmeasday:publish-counts";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import { Templates } from "/lib/collections";
 
-Meteor.publish("Templates", function (query, options) {
-  check(query, Match.Optional(Object));
-  check(options, Match.Optional(Object));
-
-  const marketplaceSettings = Reaction.getMarketplaceSettings();
+Meteor.publish("Templates", function () {
   const shopId = Reaction.getShopId();
 
-  const countSelector = query || {}; // The query selector we use for the Counts publication
-  const findSelector = {}; // The query selector we'll use for the Templates publication
-
-  // If we're using marketplace merchantTemplates we need to ensure we have a shopId and use the shopId in the selector
-  if (marketplaceSettings && marketplaceSettings.public && marketplaceSettings.public.merchantTemplates) {
-    if (!shopId) {
-      return this.ready();
-    }
-
-    // append shopId to query
-    countSelector.shopId = shopId;
-    findSelector.shopId = shopId;
-  }
-
-  // If we aren't using merchantTemplates, we'll share templates with the primary shop
-
-  // Original comments
-  // templates could be shared
-  // if you disregarded shopId
-
-  // appends a count to the collection
-  // we're doing this for use with griddleTable
-  Counts.publish(this, "templates-count", Templates.find(
-    countSelector,
-    options
-  ));
+  Counts.publish(this, "templates-count", Templates.find({ shopId }));
 
-  return Templates.find(findSelector);
+  return Templates.find({ shopId });
 });
diff --git a/imports/plugins/core/orders/client/components/OrderHeader.js b/imports/plugins/core/orders/client/components/OrderHeader.js
index 9bd51a9158..946ff28d9b 100644
--- a/imports/plugins/core/orders/client/components/OrderHeader.js
+++ b/imports/plugins/core/orders/client/components/OrderHeader.js
@@ -66,7 +66,7 @@ function OrderHeader(props) {
           {paymentStatusChip}
           <Grid item>
             <Button
-              href={`/operator/orders/print/${order.referenceId}`}
+              href={`/orders/print/${order.referenceId}`}
               variant="text"
             >
               {i18next.t("admin.orderWorkflow.invoice.printInvoice", "Print invoice")}
diff --git a/imports/plugins/core/orders/client/components/OrderIdCell.js b/imports/plugins/core/orders/client/components/OrderIdCell.js
index 47b1f825cf..a924397bbe 100644
--- a/imports/plugins/core/orders/client/components/OrderIdCell.js
+++ b/imports/plugins/core/orders/client/components/OrderIdCell.js
@@ -21,7 +21,7 @@ function OrderIdCell({ row, history }) {
   const classes = useStyles();
 
   const handleClick = () => {
-    history.push(`/operator/orders/${row.values.referenceId}`);
+    history.push(`/orders/${row.values.referenceId}`);
   };
 
   let chipColor;
diff --git a/imports/plugins/core/orders/client/components/OrderPrint.js b/imports/plugins/core/orders/client/components/OrderPrint.js
index c17e85d14a..5738cbc3ac 100644
--- a/imports/plugins/core/orders/client/components/OrderPrint.js
+++ b/imports/plugins/core/orders/client/components/OrderPrint.js
@@ -61,7 +61,7 @@ function OrderPrint(props) {
           <Grid container alignItems="center" direction="row" justify="space-between">
             <Grid item>
               <Button
-                href={`/operator/orders/${order.referenceId}`}
+                href={`/orders/${order.referenceId}`}
               >
                 <ChevronLeftIcon className={classes.iconButton} />
                 Back
diff --git a/imports/plugins/core/orders/client/components/OrdersTable.js b/imports/plugins/core/orders/client/components/OrdersTable.js
index f208dfd2bf..03b0a23a45 100644
--- a/imports/plugins/core/orders/client/components/OrdersTable.js
+++ b/imports/plugins/core/orders/client/components/OrdersTable.js
@@ -87,7 +87,7 @@ function OrdersTable({ history }) {
 
   // Row click callback
   const onRowClick = useCallback(async ({ row }) => {
-    history.push(`/operator/orders/${row.values.referenceId}`);
+    history.push(`/orders/${row.values.referenceId}`);
   }, [history]);
 
   const dataTableProps = useDataTable({
diff --git a/imports/plugins/core/payments/client/settings/settings.html b/imports/plugins/core/payments/client/settings/settings.html
index 28e0dfd1f9..eec01cb286 100644
--- a/imports/plugins/core/payments/client/settings/settings.html
+++ b/imports/plugins/core/payments/client/settings/settings.html
@@ -1,27 +1,5 @@
 <template name="paymentSettings">
   <div class="panel-group" id="paymentSettingsAccordian" role="tablist" aria-multiselectable="true">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <div class="panel-title">
-          <a
-            href="#payment-methods"
-            aria-controls="paymentMethods"
-            role="button"
-            data-toggle="collapse"
-            data-parent="#paymentSettingsAccordian"
-            data-i18n="admin.paymentSettings.paymentMethod">Default Method</a>
-        </div>
-      </div>
-      <div id="payment-methods" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="paymentMethods">
-        <div class="panel-body">
-          {{#autoForm collection=Collections.Shops doc=shop id="shopEditPaymentMethodsForm" type="update"
-          autosave=true}}
-            {{> afQuickField name='defaultPaymentMethod' options=paymentMethodOptions}}
-          {{/autoForm}}
-        </div>
-      </div>
-    </div>
-
     {{> discountsPaymentSettings}}
 
     {{#each paymentPlugins}}
diff --git a/imports/plugins/core/payments/client/settings/settings.js b/imports/plugins/core/payments/client/settings/settings.js
index ea76911d63..0b6b0f33a4 100644
--- a/imports/plugins/core/payments/client/settings/settings.js
+++ b/imports/plugins/core/payments/client/settings/settings.js
@@ -2,19 +2,32 @@ import _ from "lodash";
 import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
 import simpleGraphQLClient from "/imports/plugins/core/graphql/lib/helpers/simpleClient";
 import { Template } from "meteor/templating";
-import { AutoForm } from "meteor/aldeed:autoform";
 import { Meteor } from "meteor/meteor";
-import { Reaction, i18next } from "/client/api";
+import { Reaction } from "/client/api";
 import { ReactiveDict } from "meteor/reactive-dict";
-import { Shops } from "/lib/collections";
 
 Template.paymentSettings.onCreated(async function () {
   this.state = new ReactiveDict();
-  this.state.setDefault({ shopId: null, paymentMethods: [] });
+  this.state.setDefault({ paymentMethods: [], shopId: null });
 
-  const [shopId] = await getOpaqueIds([{ namespace: "Shop", id: Reaction.getShopId() }]);
-  const { paymentMethods } = await simpleGraphQLClient.queries.paymentMethods({ shopId });
-  this.state.set({ paymentMethods, shopId });
+  this.autorun(async () => {
+    const shopId = Reaction.getShopId();
+    if (!shopId) {
+      this.state.set({ paymentMethods: [], shopId: null });
+      return;
+    }
+
+    const [opaqueShopId] = await getOpaqueIds([{ namespace: "Shop", id: shopId }]);
+    const { paymentMethods } = await simpleGraphQLClient.queries.paymentMethods({ shopId: opaqueShopId });
+    this.state.set({ paymentMethods, shopId: opaqueShopId });
+  });
+
+  this.autorun(async () => {
+    const shopId = Reaction.getShopId();
+    if (shopId) {
+      this.subscribe("Packages", shopId);
+    }
+  });
 });
 
 Template.paymentSettings.helpers({
@@ -24,31 +37,11 @@ Template.paymentSettings.helpers({
     // Omit discounts, which we have a separate template for
     return plugins.filter(({ packageName }) => packageName !== "discount-codes");
   },
-  paymentMethodOptions() {
-    const options = [{ label: "Auto", value: "none" }];
-
-    // This should return true payment methods only, i.e., not the discounts method.
-    const paymentMethods = Template.instance().state.get("paymentMethods");
-    if (_.isArray(paymentMethods)) {
-      for (const method of paymentMethods) {
-        if (!method.isEnabled) continue;
-        options.push({
-          label: method.displayName,
-          value: method.name
-        });
-      }
-    }
-
-    return options;
-  },
   paymentMethodsForPlugin() {
     const paymentMethods = Template.instance().state.get("paymentMethods");
     if (!Array.isArray(paymentMethods)) return [];
 
     return paymentMethods.filter((method) => method.pluginName === this.packageName);
-  },
-  shop() {
-    return Shops.findOne(Reaction.getShopId());
   }
 });
 
@@ -72,17 +65,6 @@ Template.paymentSettings.events({
   }
 });
 
-AutoForm.hooks({
-  shopEditPaymentMethodsForm: {
-    onSuccess() {
-      return Alerts.toast(i18next.t("shopSettings.shopPaymentMethodsSaved"), "success");
-    },
-    onError(operation, error) {
-      return Alerts.toast(`${i18next.t("shopSettings.shopPaymentMethodsFailed")} ${error}`, "error");
-    }
-  }
-});
-
 // Handle legacy discount codes payment method
 Template.discountsPaymentSettings.helpers({
   checked(enabled) {
diff --git a/imports/plugins/core/router/lib/router.js b/imports/plugins/core/router/lib/router.js
index 8e1cb9e4a1..45e1e5e27b 100644
--- a/imports/plugins/core/router/lib/router.js
+++ b/imports/plugins/core/router/lib/router.js
@@ -460,31 +460,9 @@ function selectLayout(layout, setLayout, setWorkflow) {
 function ReactionLayout(options = {}) {
   // Find a workflow layout to render
 
-  // By default we'll use the primary shop for layouts
-  let shopId = Router.Reaction.getPrimaryShopId();
-
-  // We'll check the marketplace settings too so that we can use the active shopId
-  // if merchantTemplates is enabled
-  // XXX: using merchantTemplates is not ready for production and has not been tested! Use at your own risk.
-  let marketplaceSettings;
-
-  if (Meteor.isClient) { // If we're on the client, use the cached marketplace settings
-    marketplaceSettings = Router.Reaction.marketplace;
-  } else { // if we're on the server, go get the settings from the db with this method
-    marketplaceSettings = Router.Reaction.getMarketplaceSettings();
-    if (marketplaceSettings && marketplaceSettings.public) {
-      // We're only interested in the public settings here
-      marketplaceSettings = marketplaceSettings.public;
-    }
-  }
-
-  // If merchantTemplates is enabled, use the active shopId
-  if (marketplaceSettings && marketplaceSettings.merchantTemplates === true) {
-    shopId = Router.Reaction.getShopId();
-  }
-
   // Get the shop data
-  const shop = Shops.findOne(shopId);
+  const shopId = Router.Reaction.getPrimaryShopId();
+  const shop = Shops.findOne({ _id: shopId });
 
   // get the layout & workflow from options if they exist
   // Otherwise get them from the Session. this is set in `/client/config/defaults`
diff --git a/imports/plugins/core/tags/client/components/TagProductTable.js b/imports/plugins/core/tags/client/components/TagProductTable.js
index be419bef7c..c73b3083ac 100644
--- a/imports/plugins/core/tags/client/components/TagProductTable.js
+++ b/imports/plugins/core/tags/client/components/TagProductTable.js
@@ -75,7 +75,7 @@ class TagProductTable extends Component {
                       <TableRow key={product._id}>
                         <TableCell component="th" scope="row">{product._id}</TableCell>
                         <TableCell>
-                          <Link href={`/operator/products/${product._id}`}>{product.title}</Link>
+                          <Link href={`/products/${product._id}`}>{product.title}</Link>
                         </TableCell>
                         <TableCell align="right">
                           <TextInput
diff --git a/imports/plugins/core/tags/client/pages/TagFormPageWithData.js b/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
index 6a311ec6a4..4bebd5a095 100644
--- a/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
+++ b/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
@@ -31,11 +31,11 @@ class TagFormPageWithData extends Component {
   }
 
   handleCreate = (tag) => {
-    this.props.history.push(`/operator/tags/edit/${tag._id}`);
+    this.props.history.push(`/tags/edit/${tag._id}`);
   }
 
   handleCancel = () => {
-    this.props.history.push("/operator/tags");
+    this.props.history.push("/tags");
   }
 
   handleUpload = (files) => {
diff --git a/imports/plugins/core/tags/client/pages/TagSettingsPageWithData.js b/imports/plugins/core/tags/client/pages/TagSettingsPageWithData.js
index 1c7caedb17..b9a2ab5952 100644
--- a/imports/plugins/core/tags/client/pages/TagSettingsPageWithData.js
+++ b/imports/plugins/core/tags/client/pages/TagSettingsPageWithData.js
@@ -55,12 +55,12 @@ class TagSettings extends Component {
         selection: []
       });
 
-      this.props.history.push(`/operator/tags/edit/${rowData._id}`);
+      this.props.history.push(`/tags/edit/${rowData._id}`);
     }
   }
 
   handleShowCreateForm = () => {
-    this.props.history.push("/operator/tags/create");
+    this.props.history.push("/tags/create");
   }
 
   handleBulkAction = async (action, itemIds) => {
diff --git a/imports/plugins/core/taxes/client/settings/settings.js b/imports/plugins/core/taxes/client/settings/settings.js
index 7243886a5a..a2650f0892 100644
--- a/imports/plugins/core/taxes/client/settings/settings.js
+++ b/imports/plugins/core/taxes/client/settings/settings.js
@@ -1,9 +1,16 @@
 import { Template } from "meteor/templating";
+import { Reaction } from "/client/api";
 import GeneralTaxSettings from "../containers/GeneralTaxSettings";
 
-/*
- * Template taxes Helpers
- */
+Template.taxSettings.onCreated(async function () {
+  this.autorun(async () => {
+    const shopId = Reaction.getShopId();
+    if (shopId) {
+      this.subscribe("Packages", shopId);
+    }
+  });
+});
+
 Template.taxSettings.helpers({
   GeneralTaxSettings() {
     return GeneralTaxSettings;
diff --git a/imports/plugins/core/ui/client/components/app/app.js b/imports/plugins/core/ui/client/components/app/app.js
index 4f5a480940..343ba77097 100644
--- a/imports/plugins/core/ui/client/components/app/app.js
+++ b/imports/plugins/core/ui/client/components/app/app.js
@@ -98,16 +98,9 @@ class App extends Component {
 
     const { currentRoute } = this.props;
 
-    // Since we currently don't have any content on `/`, forward to /operator when landing on `/`
-    if (currentRoute && currentRoute.route && currentRoute.route.fullPath === "/") {
-      window.location.replace("/operator");
-    }
-
     const layout = currentRoute && currentRoute.route && currentRoute.route.options && currentRoute.route.options.layout;
     if (this.isAdminApp && layout !== "printLayout" && !this.noAdminControls) {
-      if (currentRoute.route.path.startsWith("/operator")) {
-        return this.renderOperatorApp();
-      }
+      return this.renderOperatorApp();
     }
 
     return (
diff --git a/imports/plugins/core/ui/client/components/tags/tagItem.js b/imports/plugins/core/ui/client/components/tags/tagItem.js
index 52744d8bd7..8f42ed1768 100644
--- a/imports/plugins/core/ui/client/components/tags/tagItem.js
+++ b/imports/plugins/core/ui/client/components/tags/tagItem.js
@@ -54,7 +54,7 @@ class TagItem extends Component {
   handleTagEdit = () => {
     const { tag, history } = this.props;
 
-    history.push(`/operator/tags/edit/${tag._id}`);
+    history.push(`/tags/edit/${tag._id}`);
   }
 
   /**
diff --git a/imports/plugins/included/discount-codes/server/util/getCart.js b/imports/plugins/included/discount-codes/server/util/getCart.js
index ad004f5d42..3aeae52f6f 100644
--- a/imports/plugins/included/discount-codes/server/util/getCart.js
+++ b/imports/plugins/included/discount-codes/server/util/getCart.js
@@ -16,7 +16,7 @@ import Reaction from "/imports/plugins/core/core/server/Reaction";
  *   and `account` (the account document in case the calling code needs it without another request)
  */
 export default function getCart(cartId, { cartToken, throwIfNotFound = false } = {}) {
-  const shopId = Reaction.getCartShopId();
+  const shopId = Reaction.getPrimaryShopId();
   if (!shopId) {
     throw new Meteor.Error("not-found", "Cart not found");
   }
diff --git a/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js b/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
index 8cf9dc1785..34651b8be5 100644
--- a/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
+++ b/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from "react";
+import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Components } from "@reactioncommerce/reaction-components";
 import { Translation } from "/imports/plugins/core/ui/client/components";
@@ -16,7 +16,6 @@ class SMTPEmailConfig extends Component {
     this.toggleSettings = this.toggleSettings.bind(this);
   }
 
-
   togglePassword() {
     this.setState({
       showPassword: !this.state.showPassword
@@ -45,24 +44,24 @@ class SMTPEmailConfig extends Component {
           />
         </div>
         <div className="email-config-status">
-          <strong><Translation defaultValue={"Status"} i18nKey={"admin.settings.status"} /></strong>: {status ?
+          <strong><Translation defaultValue="Status" i18nKey="admin.settings.status" /></strong>: {status ?
             <i className={`fa fa-circle ${status}`} />
             : <i className={"fa fa-refresh fa-spin"} />}
         </div>
         <div>
-          <strong><Translation defaultValue={"Service"} i18nKey={"admin.settings.service"} /></strong>: {service || <NotSet/>}
+          <strong><Translation defaultValue="Service" i18nKey="admin.settings.service" /></strong>: {service || <NotSet/>}
         </div>
         <div className="truncate">
-          <strong><Translation defaultValue={"Host"} i18nKey={"admin.settings.host"} /></strong>: {host || <NotSet/>}
+          <strong><Translation defaultValue="Host" i18nKey="admin.settings.host" /></strong>: {host || <NotSet/>}
         </div>
         <div>
-          <strong><Translation defaultValue={"Port"} i18nKey={"admin.settings.port"} /></strong>: {port || <NotSet/>}
+          <strong><Translation defaultValue="Port" i18nKey="admin.settings.port" /></strong>: {port || <NotSet/>}
         </div>
         <div className="truncate">
-          <strong><Translation defaultValue={"User"} i18nKey={"admin.settings.user"} /></strong>: {user || <NotSet/>}
+          <strong><Translation defaultValue="User" i18nKey="admin.settings.user" /></strong>: {user || <NotSet/>}
         </div>
         <div>
-          <strong><Translation defaultValue={"Password"} i18nKey={"admin.settings.password"} /></strong>:&nbsp;&nbsp;
+          <strong><Translation defaultValue="Password" i18nKey="admin.settings.password" /></strong>:&nbsp;&nbsp;
           {password ?
             <span>
               {showPassword ? password : "********"}
@@ -97,8 +96,8 @@ class SMTPEmailConfig extends Component {
           <hr />
           <h4>
             <Translation
-              defaultValue={"Edit Settings"}
-              i18nKey={"admin.settings.editSettings"}
+              defaultValue="Edit Settings"
+              i18nKey="admin.settings.editSettings"
             />
           </h4>
           <Components.SMTPEmailSettings showSettings={showSettings} />
@@ -111,10 +110,19 @@ class SMTPEmailConfig extends Component {
 
   render() {
     return (
-      <Fragment>
-        {this.renderSettingsDisplay()}
-        {this.renderSettingsUpdate()}
-      </Fragment>
+      <Components.CardGroup>
+        <Components.Card>
+          <Components.CardHeader
+            actAsExpander={true}
+            i18nKeyTitle="admin.settings.mailProvider"
+            title="Mail Provider"
+          />
+          <Components.CardBody>
+            {this.renderSettingsDisplay()}
+            {this.renderSettingsUpdate()}
+          </Components.CardBody>
+        </Components.Card>
+      </Components.CardGroup>
     );
   }
 }
diff --git a/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js b/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
index faf305dc56..f0fdbf0815 100644
--- a/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
+++ b/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
@@ -3,8 +3,9 @@ import PropTypes from "prop-types";
 import getServiceConfig from "nodemailer-wellknown";
 import { withApollo } from "react-apollo";
 import { compose, withProps } from "recompose";
-import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
+import { composeWithTracker } from "@reactioncommerce/reaction-components";
 import { Meteor } from "meteor/meteor";
+import { Packages } from "/lib/collections";
 import { Reaction } from "/client/api";
 import actions from "../actions";
 import SMTPEmailConfig from "../components/SMTPEmailConfig";
@@ -104,8 +105,13 @@ const wrapComponent = (Comp) => (
 );
 
 const composer = (props, onData) => {
-  if (Meteor.subscribe("Packages").ready()) {
-    const shopSettings = Reaction.getShopSettings();
+  const shopId = Reaction.getShopId();
+  if (!shopId) return;
+
+  const pkgSub = Meteor.subscribe("Packages", shopId);
+  if (pkgSub.ready()) {
+    const pkg = Packages.findOne({ name: "core", shopId }) || {};
+    const shopSettings = pkg.settings || {};
     const settings = shopSettings.mail || {};
 
     if (settings.service && settings.service !== "custom") {
@@ -123,13 +129,6 @@ const composer = (props, onData) => {
 
 const handlers = { saveSettings: actions.settings.saveSettings };
 
-registerComponent("SMTPEmailConfig", SMTPEmailConfig, [
-  composeWithTracker(composer),
-  withProps(handlers),
-  withApollo,
-  wrapComponent
-]);
-
 export default compose(
   composeWithTracker(composer),
   withProps(handlers),
diff --git a/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js b/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
index afcaee5884..df60bf9101 100644
--- a/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
+++ b/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
@@ -3,14 +3,21 @@ import { withApollo } from "react-apollo";
 import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
 import { Meteor } from "meteor/meteor";
 import { Reaction } from "/client/api";
+import { Packages } from "/lib/collections";
 import actions from "../actions";
 import SMTPEmailSettings from "../components/SMTPEmailSettings";
 
 const providers = require("nodemailer-wellknown/services.json");
 
 const composer = (props, onData) => {
-  if (Meteor.subscribe("Packages", Reaction.getShopId()).ready()) {
-    const settings = Reaction.getShopSettings().mail || {};
+  const shopId = Reaction.getShopId();
+  if (!shopId) return;
+
+  const pkgSub = Meteor.subscribe("Packages", shopId);
+  if (pkgSub.ready()) {
+    const pkg = Packages.findOne({ name: "core", shopId }) || {};
+    const shopSettings = pkg.settings || {};
+    const settings = shopSettings.mail || {};
 
     const { service, host, port, user, password } = settings;
 
diff --git a/imports/plugins/included/email-smtp/client/index.js b/imports/plugins/included/email-smtp/client/index.js
index 554cf582d4..d1e8c629e0 100644
--- a/imports/plugins/included/email-smtp/client/index.js
+++ b/imports/plugins/included/email-smtp/client/index.js
@@ -1,2 +1,10 @@
-import "./containers/SMTPEmailConfigContainer";
+import { registerBlock } from "@reactioncommerce/reaction-components";
+import SMTPEmailConfig from "./containers/SMTPEmailConfigContainer";
 import "./containers/SMTPEmailSettingsContainer";
+
+registerBlock({
+  region: "EmailSettings",
+  name: "SMTPEmailConfig",
+  component: SMTPEmailConfig,
+  priority: 1
+});
diff --git a/imports/plugins/included/marketplace/client/components/index.js b/imports/plugins/included/marketplace/client/components/index.js
deleted file mode 100644
index a5729666ec..0000000000
--- a/imports/plugins/included/marketplace/client/components/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as MarketplaceShops } from "./marketplaceShops";
-export { default as MarketplaceShopTableCell } from "./marketplaceShopTableCell";
diff --git a/imports/plugins/included/marketplace/client/components/marketplaceShopTableCell.js b/imports/plugins/included/marketplace/client/components/marketplaceShopTableCell.js
deleted file mode 100644
index 08e375adfc..0000000000
--- a/imports/plugins/included/marketplace/client/components/marketplaceShopTableCell.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import _ from "lodash";
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components, registerComponent } from "@reactioncommerce/reaction-components";
-import { SHOP_WORKFLOW_STATUS_ACTIVE, SHOP_WORKFLOW_STATUS_DISABLED } from "../../lib/constants";
-
-class MarketplaceShopTableCell extends Component {
-  static propTypes = {
-    data: PropTypes.object,
-    field: PropTypes.string,
-    onWorkflowChange: PropTypes.func
-  }
-
-  get shop() {
-    return this.props.data.original;
-  }
-
-  get status() {
-    if (this.shop.workflow) {
-      return this.shop.workflow.status;
-    }
-
-    return SHOP_WORKFLOW_STATUS_ACTIVE;
-  }
-
-  handleWorkflowChange = (event, value) => {
-    if (this.props.onWorkflowChange) {
-      // Get the shop id from the original document
-      const { _id } = this.shop;
-
-      this.props.onWorkflowChange(_id, value);
-    }
-  }
-
-  render() {
-    const { field, data } = this.props;
-
-    if (field === "emails" && Array.isArray(data.value) && data.value.length) {
-      return (
-        <div className="table-cell body">
-          <span>{data.value[0].address}</span>
-        </div>
-      );
-    }
-
-    if (field === "workflow") {
-      return (
-        <Components.DropDownMenu
-          buttonElement={
-            <div className="col-dropdown">
-              <Components.Button bezelStyle="solid" label={_.startCase(this.status)}>
-                &nbsp;
-                <i className="fa fa-chevron-down" />
-              </Components.Button>
-            </div>
-          }
-          onChange={this.handleWorkflowChange}
-          value={this.status}
-        >
-          <Components.MenuItem
-            label="Active"
-            value={SHOP_WORKFLOW_STATUS_ACTIVE}
-          />
-          <Components.MenuItem
-            label="Disabled"
-            value={SHOP_WORKFLOW_STATUS_DISABLED}
-          />
-        </Components.DropDownMenu>
-      );
-    }
-
-
-    return (
-      <div className="table-cell body">
-        <span>{data.value}</span>
-      </div>
-    );
-  }
-}
-
-registerComponent("MarketplaceShopTableCell", MarketplaceShopTableCell);
-
-export default MarketplaceShopTableCell;
diff --git a/imports/plugins/included/marketplace/client/components/marketplaceShops.js b/imports/plugins/included/marketplace/client/components/marketplaceShops.js
deleted file mode 100644
index 2b8e9fd225..0000000000
--- a/imports/plugins/included/marketplace/client/components/marketplaceShops.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components } from "@reactioncommerce/reaction-components";
-
-class MarketplaceShops extends Component {
-  static propTypes = {
-    onWorkflowChange: PropTypes.func,
-    shops: PropTypes.arrayOf(PropTypes.object)
-  }
-
-  renderShopsTable() {
-    const fields = ["name", "emails", "workflow"];
-
-    const columnMetadata = fields.map((field) => ({
-      Header: <Components.Translation i18nKey={`marketplaceShops.headers.${field}`} defaultValue={field} />,
-      accessor: field,
-      Cell: (data) => (
-        <Components.MarketplaceShopTableCell
-          data={data}
-          field={field}
-          onWorkflowChange={this.props.onWorkflowChange}
-        />
-      )
-    }));
-
-    return (
-      <Components.SortableTable
-        data={this.props.shops}
-        columnMetadata={columnMetadata}
-        filteredFields={fields}
-        filterType="none"
-        showFilter={true}
-        isSortable={false}
-      />
-    );
-  }
-
-  render() {
-    return (
-      <div className="rui sortable-table-container">
-        <div className="rui sortable-table">
-          {this.renderShopsTable()}
-        </div>
-      </div>
-    );
-  }
-}
-
-export default MarketplaceShops;
diff --git a/imports/plugins/included/marketplace/client/containers/index.js b/imports/plugins/included/marketplace/client/containers/index.js
deleted file mode 100644
index 36f908fcf2..0000000000
--- a/imports/plugins/included/marketplace/client/containers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as MarketplaceShopsContainer } from "./marketplaceShops";
diff --git a/imports/plugins/included/marketplace/client/containers/marketplaceShops.js b/imports/plugins/included/marketplace/client/containers/marketplaceShops.js
deleted file mode 100644
index 4baab31add..0000000000
--- a/imports/plugins/included/marketplace/client/containers/marketplaceShops.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { composeWithTracker, registerComponent } from "@reactioncommerce/reaction-components";
-import { Meteor } from "meteor/meteor";
-import { Shops } from "/lib/collections";
-import { Reaction } from "/client/api";
-import MarketplaceShops from "../components/marketplaceShops";
-
-const onWorkflowChange = (shopId, value) => {
-  Meteor.call("marketplace/updateShopWorkflow", shopId, value);
-};
-
-const composer = (props, onData) => {
-  const shops = Shops.find({
-    _id: {
-      $nin: [Reaction.getPrimaryShopId()]
-    }
-  }).fetch();
-
-  onData(null, {
-    shops,
-    onWorkflowChange
-  });
-};
-
-registerComponent("MarketplaceShops", MarketplaceShops, composeWithTracker(composer));
-
-export default composeWithTracker(composer)(MarketplaceShops);
diff --git a/imports/plugins/included/marketplace/client/index.js b/imports/plugins/included/marketplace/client/index.js
deleted file mode 100644
index 78678d9922..0000000000
--- a/imports/plugins/included/marketplace/client/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import "./templates/becomeSellerButton/becomeSellerButton.html";
-import "./templates/becomeSellerButton/becomeSellerButton.js";
-
-import "./templates/dashboard/settings.html";
-import "./templates/dashboard/settings.js";
-
-import "./templates/dashboard/merchant-settings.html";
-import "./templates/dashboard/merchant-settings.js";
-
-import "./templates/shops/shopSelect.html";
-import "./templates/shops/shopSelect.js";
-
-import "./templates/stripeConnectSignupButton/stripeConnectSignupButton.html";
-import "./templates/stripeConnectSignupButton/stripeConnectSignupButton.js";
-
-import "./templates/settings/authorize.html";
-import "./templates/settings/authorize.js";
-
-import "./templates/settings/merchant-settings.html";
-import "./templates/settings/merchant-settings.js";
-
-import "./templates/settings/stripe.html";
-import "./templates/settings/stripe.js";
-
-export * from "./components";
-export * from "./containers";
diff --git a/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.html b/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.html
deleted file mode 100644
index 7e51c1f9cc..0000000000
--- a/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="becomeSellerButton">
-  <button
-    class="btn btn-info"
-    data-event-category="marketplace"
-    data-event-action="button-click-become-seller"
-    data-event-label="Become a Seller button click"
-    data-event-value="clicked"
-    data-i18n="marketplace.becomeSeller">Become a seller</button>
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.js b/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.js
deleted file mode 100644
index fc1c8ca484..0000000000
--- a/imports/plugins/included/marketplace/client/templates/becomeSellerButton/becomeSellerButton.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import { Template } from "meteor/templating";
-import { Reaction, i18next } from "/client/api";
-
-Template.becomeSellerButton.events({
-  "click [data-event-action='button-click-become-seller']"() {
-    Meteor.call("shop/createShop", Reaction.getUserId(), (error, response) => {
-      if (error) {
-        const errorMessage = i18next.t("marketplace.errorCannotCreateShop", { defaultValue: "Could not create shop for current user {{user}}" });
-        return Alerts.toast(`${errorMessage} ${error}`, "error");
-      }
-
-      const success = i18next.t("marketplace.yourShopIsReady", { defaultValue: "Your shop is now ready!" });
-      Reaction.setShopId(response.shopId);
-      return Alerts.toast(success, "success");
-    });
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.html b/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.html
deleted file mode 100644
index c52e339eb4..0000000000
--- a/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<template name="marketplaceMerchantSettings">
-  <div class="marketplaceMerchantSettings">
-  {{#each reactionApps provides='marketplaceMerchantSettings'}}
-    <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
-    <div class="{{shown enabled}}">
-      {{> React component=ReactComponentOrBlazeTemplate name=template props=.}}
-    </div>
-  {{/each}}
-  </div>
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.js b/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.js
deleted file mode 100644
index 1b91a78c48..0000000000
--- a/imports/plugins/included/marketplace/client/templates/dashboard/merchant-settings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Template } from "meteor/templating";
-
-Template.marketplaceMerchantSettings.helpers({
-  shown(enabled) {
-    if (enabled !== true) {
-      return "hidden";
-    }
-    return "";
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/dashboard/settings.html b/imports/plugins/included/marketplace/client/templates/dashboard/settings.html
deleted file mode 100644
index b14a2af141..0000000000
--- a/imports/plugins/included/marketplace/client/templates/dashboard/settings.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="marketplaceShopSettings">
-  {{#autoForm collection=Collections.Packages schema=MarketplacePackageConfig
-              doc=packageData id="marketplaceOptionsForm" type="update" autosave=true}}
-    {{> afFieldInput name="settings.public.allowMerchantSignup"}}
-    <!-- TODO: As we add optional functionality to marketplace, add options here -->
-  {{/autoForm}}
-
-  {{schema}}
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/dashboard/settings.js b/imports/plugins/included/marketplace/client/templates/dashboard/settings.js
deleted file mode 100644
index 7bf25cf489..0000000000
--- a/imports/plugins/included/marketplace/client/templates/dashboard/settings.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Template } from "meteor/templating";
-import { AutoForm } from "meteor/aldeed:autoform";
-import { Reaction, i18next } from "/client/api";
-import { Packages } from "/lib/collections";
-import { MarketplacePackageConfig } from "../../../lib/collections/schemas";
-
-/**
- * marketplaceShopSettings helpers
- *
- */
-Template.marketplaceShopSettings.helpers({
-  MarketplacePackageConfig() {
-    return MarketplacePackageConfig;
-  },
-
-  packageData() {
-    return Packages.findOne({
-      name: "reaction-marketplace",
-      shopId: Reaction.getPrimaryShopId()
-    });
-  }
-});
-
-/**
- * marketplaceSettings autoform alerts
- */
-
-AutoForm.hooks({
-  marketplaceOptionsForm: {
-    onSuccess() {
-      return Alerts.toast(
-        i18next.t("admin.settings.dashboardMarketplaceSettingsSaved"),
-        "success"
-      );
-    },
-    onError(operation, error) {
-      return Alerts.toast(`${i18next.t("admin.settings.dashboardMarketplaceSettingsFailed")} ${error}`, "error");
-    }
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/settings/authorize.html b/imports/plugins/included/marketplace/client/templates/settings/authorize.html
deleted file mode 100644
index d20ca6b304..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/authorize.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="stripeConnectAuthorize">
-  <div class="stripe-connect-authorize">
-    {{> React component=loading}}
-  </div>
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/settings/authorize.js b/imports/plugins/included/marketplace/client/templates/settings/authorize.js
deleted file mode 100644
index 916991f9b4..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/authorize.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import { Template } from "meteor/templating";
-import { Reaction, i18next } from "client/api";
-import { Components } from "@reactioncommerce/reaction-components";
-
-Template.stripeConnectAuthorize.onCreated(() => {
-  const shopId = Reaction.Router.getQueryParam("state");
-  const authCode = Reaction.Router.getQueryParam("code");
-  const error = Reaction.Router.getQueryParam("error");
-
-  if (error) {
-    return Alerts.toast(`${i18next.t("admin.connect.shopUserDeniedRequest")}`, "error");
-  }
-
-  if (shopId && authCode) {
-    Meteor.call("stripe/connect/authorizeMerchant", shopId, authCode, (err) => {
-      if (error) {
-        Alerts.toast(`${i18next.t("admin.connect.stripeConnectAccountLinkFailure")} ${err}`, "error");
-      } else {
-        Alerts.toast(`${i18next.t("admin.connect.stripeConnectAccountLinkSuccess")}`, "success");
-      }
-      location.href = "/";
-    });
-  }
-
-  return null;
-});
-
-Template.stripeConnectAuthorize.helpers({
-  loading() {
-    return Components.Loading;
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.html b/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.html
deleted file mode 100644
index f57c5d71a9..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<template name="stripeConnectMerchantSignup">
-  {{#if stripeConnectIsConnected}}
-    {{> stripeConnectAccountDetails}}
-  {{else}}
-    {{> stripeConnectSignupButton}}
-  {{/if}}
-</template>
-
-<template name="stripeConnectAccountDetails">
-  <i class="fa fa-check"></i> Your Stripe Account is Connected<br>
-  To check recent transactions, view your <a href="https://dashboard.stripe.com/test/dashboard" target="_blank">Stripe Account dashboard</a>.
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.js b/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.js
deleted file mode 100644
index abfafe7f5b..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/merchant-settings.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Template } from "meteor/templating";
-
-import { Reaction } from "/client/api";
-
-Template.stripeConnectMerchantSignup.helpers({
-  stripeConnectIsConnected() {
-    const stripe = Reaction.getPackageSettingsWithOptions({
-      shopId: Reaction.getShopId(),
-      name: "reaction-marketplace"
-    });
-    return stripe && stripe.settings && stripe.settings.connectAuth && stripe.settings.connectAuth.access_token;
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/settings/stripe.html b/imports/plugins/included/marketplace/client/templates/settings/stripe.html
deleted file mode 100644
index e03100a0ff..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/stripe.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<template name="stripeMarketplaceSettings">
-  {{#unless packageData.settings.api_key}}
-  <div class="alert alert-info">
-    <span data-i18n="admin.paymentSettings.stripeSettingsDescription">Don't have a Stripe API Secret Key?</span>
-    <a href="https://dashboard.stripe.com/account/apikeys" target="_blank">
-      <span data-i18n="admin.paymentSettings.stripeSettingsGetItHere">Get it here.</span>
-    </a>
-  </div>
-  {{/unless}}
-  <div>
-    {{#autoForm collection=Collections.Packages schema=StripePackageConfig doc=packageData type="update" id="stripe-marketplace-update-form"}}
-      {{>afQuickField name='settings.api_key'}}
-      {{>afQuickField name='settings.public.publishable_key'}}
-      <br>
-      <span data-i18n="admin.paymentSettings.stripeClientIdWarning">The Client ID is a <strong>PUBLIC</strong> field. Please ensure you're using the `client_id` found on the </span>
-      <a target="_blank" href="https://dashboard.stripe.com/account/applications/settings">
-        <span data-i18n="admin.paymentSettings.stripeClientIDLink">Stripe Connect Settings</span>
-      </a>
-      {{>afQuickField name='settings.public.client_id'}}
-      <br>
-      <span data-i18n="admin.connect.applicationFeeDescription">
-        This number represents a percentage fee that the marketplace (this shop) takes for any item which is sold
-        by a merchant shop for this marketplace. This fee applies only if Stripe Connect is setup and enabled on both
-        the marketplace and the merchant shops and if Stripe is the payment provider used to perform the checkout.
-      </span>
-      <br>
-      <span data-i18n="admin.connect.moreDetails">For more details, see the</span>
-      <a target="_blank" href="https://stripe.com/docs/connect/direct-charges#flow-of-funds-with-fees">
-        <span data-i18n="admin.connect.docsLink">Stripe Connect Docs</span>
-      </a>
-      {{>afQuickField name="settings.applicationFee"}}
-      <button type="submit" class="btn btn-primary pull-right"><span data-i18n="app.saveChanges">Save Changes</span></button>
-    {{/autoForm}}
-  </div>
-</template>
-
-
-<template name="stripeMarketplace">
-  <div class="container-fluid-sm flex">
-    <div class="flex-item">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <div class="panel-title">Stripe Checkout</div>
-        </div>
-        <div class="list-group">
-          <div class="list-group-item">
-            {{#if packageData.settings.api_key}}
-              <span>API Secret Key: <button type="button" class="btn btn-link" data-event-action="showStripeSettings">**********</button></span>
-            {{else}}
-              <span>API Secret Key: <button type="button" class="btn btn-link" data-event-action="showStripeSettings">Configure Now</button></span>
-            {{/if}}
-          </div>
-        </div>
-        <div class="panel-footer">
-          <div class="left"></div>
-          <div class="right">
-
-            <div class="panel-footer-item">
-              {{#if packageData.settings.api_key}}
-                <i class="fa fa-check-circle fa-2x text-success"></i>
-              {{else}}
-                <i class="fa fa-minus-circle fa-2x text-muted"></i>
-              {{/if}}
-            </div>
-
-            <div class="panel-footer-item">
-              <button class="btn btn-default" data-event-action="showStripeSettings">
-                <i class="fa fa-gear"></i>
-              </button>
-            </div>
-
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/settings/stripe.js b/imports/plugins/included/marketplace/client/templates/settings/stripe.js
deleted file mode 100644
index cb6f07c2b6..0000000000
--- a/imports/plugins/included/marketplace/client/templates/settings/stripe.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Template } from "meteor/templating";
-import { AutoForm } from "meteor/aldeed:autoform";
-import { Reaction, i18next } from "/client/api";
-import { Packages } from "/lib/collections";
-import { StripeMarketplacePackageConfig } from "../../../lib/collections/schemas";
-
-/**
- * @summary get Stripe Package record
- * @returns {Object} Package data
- */
-function packageData() {
-  return Packages.findOne({
-    name: "reaction-marketplace",
-    shopId: Reaction.getShopId()
-  });
-}
-
-Template.stripeMarketplaceSettings.helpers({
-  StripePackageConfig() {
-    return StripeMarketplacePackageConfig;
-  },
-  packageData
-});
-
-Template.stripeMarketplace.helpers({
-  packageData
-});
-
-Template.stripeMarketplace.events({
-  "click [data-event-action=showStripeSettings]"() {
-    Reaction.showActionView();
-  }
-});
-
-AutoForm.hooks({
-  "stripe-marketplace-update-form": {
-    onSuccess() {
-      return Alerts.toast(i18next.t("admin.settings.saveSuccess"), "success");
-    },
-    onError(error) {
-      return Alerts.toast(`${i18next.t("admin.settings.saveFailed")} ${error}`, "error");
-    }
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/shops/shopSelect.html b/imports/plugins/included/marketplace/client/templates/shops/shopSelect.html
deleted file mode 100644
index d0ad184c9e..0000000000
--- a/imports/plugins/included/marketplace/client/templates/shops/shopSelect.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<template name="shopSelect">
-  {{#if shops}}
-    <div class="shops">
-      <div class="dropdown" role="shops">
-        <div class="dropdown-toggle"
-           data-toggle="dropdown"
-           data-delay="600"
-           aria-haspopup="true"
-           aria-expanded="false">
-
-          <span>{{currentShopName}}</span>
-
-          <span class="caret"></span>
-        </div>
-        <ul class="dropdown-menu" role="menu">
-          {{#each shops}}
-            <li class="{{isActiveShop _id}}">
-              <a class="shop" role="menuitem">{{name}}</a>
-            </li>
-          {{/each}}
-        </ul>
-      </div>
-    </div>
-  {{/if}}
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/shops/shopSelect.js b/imports/plugins/included/marketplace/client/templates/shops/shopSelect.js
deleted file mode 100644
index 52dd6fcf37..0000000000
--- a/imports/plugins/included/marketplace/client/templates/shops/shopSelect.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Template } from "meteor/templating";
-import { Reaction } from "/lib/api";
-import { Router } from "/client/api";
-import { Shops } from "/lib/collections";
-
-Template.shopSelect.helpers({
-  shops() {
-    if (Reaction.Subscriptions.PrimaryShop.ready()) {
-      return Shops.find();
-    }
-
-    return null;
-  },
-
-  isActiveShop(shopId) {
-    return shopId === Router.getParam("shopId") ? "active" : "";
-  },
-
-  currentShopName() {
-    const _id = Router.getParam("shopId") || Reaction.getShopId(); // or prime shop
-    let shop;
-
-    if (_id) {
-      shop = Shops.findOne({
-        _id
-      });
-      if (shop) {
-        return shop.name;
-      }
-    }
-
-    return "Shop Name";
-  }
-});
-
-Template.shopSelect.events({
-  "click .shop"(event) {
-    event.preventDefault();
-    Router.go("shop", {
-      shopId: this._id
-    });
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.html b/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.html
deleted file mode 100644
index de281a09a4..0000000000
--- a/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<template name="stripeConnectSignupButton">
-  <h3>Setup Stripe Account</h3>
-  <p>To accept payment and publish your products to the marketplace, you'll need
-    to connect your stripe account. If you don't have a stripe account, you can set
-    one up for free as part of this process.</p>
-  <button
-    class="btn btn-success btn-block"
-    data-event-category="marketplace"
-    data-event-action="button-click-stripe-signup"
-    data-event-label="Stripe Connect Signup button click"
-    data-event-value="clicked"
-    data-i18n="marketplace.stripeConnectSignup">Start Accepting Payment</button>
-</template>
diff --git a/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.js b/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.js
deleted file mode 100644
index 3b73846cb5..0000000000
--- a/imports/plugins/included/marketplace/client/templates/stripeConnectSignupButton/stripeConnectSignupButton.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import { Template } from "meteor/templating";
-import { Reaction } from "/lib/api";
-import { i18next } from "/client/api";
-import { Shops } from "/lib/collections";
-
-Template.stripeConnectSignupButton.events({
-  "click [data-event-action='button-click-stripe-signup']"() {
-    const shopId = Reaction.getShopId();
-    const primaryShopId = Reaction.getPrimaryShopId();
-    const primaryStripePackage = Reaction.getPackageSettingsWithOptions({
-      shopId: primaryShopId,
-      name: "reaction-marketplace",
-      enabled: true
-    });
-
-    // eslint-disable-next-line
-    // debugger;
-    let clientId;
-
-    if (primaryStripePackage &&
-        primaryStripePackage.settings &&
-        primaryStripePackage.settings.public &&
-        typeof primaryStripePackage.settings.public.client_id === "string") {
-      // If the primaryshop has stripe enabled and set the client_id
-      clientId = primaryStripePackage.settings.public.client_id;
-    } else {
-      Alerts.toast(`${i18next.t("admin.connect.stripeConnectNotEnabled")}`, "error");
-      return;
-    }
-
-    const shop = Shops.findOne({ _id: shopId });
-
-    if (!shop || !shop.workflow || shop.workflow.status !== "active") {
-      Alerts.toast(`${i18next.t("admin.connect.shopNotActive")}`, "error");
-      return;
-    }
-
-    if (!shop.emails || !Array.isArray(shop.emails) || shop.emails.length === 0) {
-      Alerts.toast(`${i18next.t("admin.connect.shopEmailNotConfigured")}`, "error");
-      return;
-    }
-
-    if (!shop.addressBook || !Array.isArray(shop.addressBook) || shop.addressBook.length === 0) {
-      Alerts.toast(`${i18next.t("admin.connect.shopAddressNotConfigured")}`, "error");
-      return;
-    }
-
-    const { country } = shop.addressBook[0];
-    const phoneNumber = shop.addressBook[0].phone;
-    const businessName = shop.addressBook[0].company;
-    const streetAddress = shop.addressBook[0].address1;
-    const { city } = shop.addressBook[0];
-    const state = shop.addressBook[0].region;
-    const zip = shop.addressBook[0].postal;
-
-    const user = Meteor.user() || {};
-
-    const defaultEmail =
-      user.emails.find((email) => email.provides === "default");
-    const defaultEmailAddress = defaultEmail ? defaultEmail.address : "";
-
-    const [firstName, ...last] = user.name ? user.name.split(" ") : [];
-    const lastName = last.join(" ");
-
-    const stripeConnectAuthorizeUrl = `https://connect.stripe.com/oauth/authorize?response_type=code&state=${shopId}&client_id=${clientId}&scope=read_write`;
-    const autofillParams = `&stripe_user[email]=${defaultEmailAddress}&stripe_user[country]=${country}&stripe_user[phone_number]=${phoneNumber}&stripe_user[business_name]=${businessName}&stripe_user[street_address]=${streetAddress}&stripe_user[city]=${city}&stripe_user[state]=${state}&stripe_user[zip]=${zip}&stripe_user[first_name]=${firstName}&stripe_user[last_name]=${lastName}`; // eslint-disable-line max-len
-    window.open(stripeConnectAuthorizeUrl + autofillParams, "_blank");
-  }
-});
diff --git a/imports/plugins/included/marketplace/client/util/placeOrder.graphql b/imports/plugins/included/marketplace/client/util/placeOrder.graphql
deleted file mode 100644
index a449ff79b9..0000000000
--- a/imports/plugins/included/marketplace/client/util/placeOrder.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-placeOrder($input: PlaceOrderInput!) {
-  placeOrder(input: $input) {
-    orders {
-      _id
-    }
-  }
-}
diff --git a/imports/plugins/included/marketplace/lib/collections/schemas/index.js b/imports/plugins/included/marketplace/lib/collections/schemas/index.js
deleted file mode 100644
index ff3568d15e..0000000000
--- a/imports/plugins/included/marketplace/lib/collections/schemas/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./marketplace";
-export * from "./stripe";
diff --git a/imports/plugins/included/marketplace/lib/collections/schemas/marketplace.js b/imports/plugins/included/marketplace/lib/collections/schemas/marketplace.js
deleted file mode 100644
index b1f9e85503..0000000000
--- a/imports/plugins/included/marketplace/lib/collections/schemas/marketplace.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import SimpleSchema from "simpl-schema";
-import { check } from "meteor/check";
-import { Tracker } from "meteor/tracker";
-import { PackageConfig, Shop } from "/lib/collections/schemas";
-import { registerSchema } from "@reactioncommerce/schemas";
-
-/**
- * @name ShopTypes
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary ShopTypes schema
- */
-export const ShopTypes = new SimpleSchema({
-  shopType: {
-    type: String,
-    defaultValue: "merchant"
-  },
-  enabled: {
-    type: Boolean,
-    defaultValue: false
-  }
-}, { check, tracker: Tracker });
-
-registerSchema("ShopTypes", ShopTypes);
-
-/**
- * @name EnabledPackagesByShopType
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary EnabledPackagesByShopType schema
- */
-export const EnabledPackagesByShopType = new SimpleSchema({
-  shopType: String,
-  enabledPackages: [String]
-}, { check, tracker: Tracker });
-
-registerSchema("EnabledPackagesByShopType", EnabledPackagesByShopType);
-
-/**
- * @name MarketplacePackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary MarketplacePackageConfig schema
- */
-export const MarketplacePackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.thirdPartyLogistics": {
-    type: Object,
-    blackbox: true,
-    optional: true
-  },
-  "settings.shops": {
-    type: Object,
-    defaultValue: {}
-  },
-  "settings.shops.enabledShopTypes": {
-    type: Array,
-    defaultValue: [{
-      shopType: "merchant",
-      enabled: true
-    }, {
-      shopType: "affiliate",
-      enabled: false
-    }]
-  },
-  "settings.shops.enabledShopTypes.$": {
-    type: ShopTypes
-  },
-  "settings.shops.enabledPackagesByShopTypes": {
-    type: Array,
-    optional: true
-  },
-  "settings.shops.enabledPackagesByShopTypes.$": {
-    type: EnabledPackagesByShopType
-  },
-  "settings.payoutMethod": {
-    type: Object,
-    blackbox: true,
-    optional: true
-  },
-  "settings.public": {
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  // if true, any user can create a shop
-  // if false, shop owners must be invited via Accounts panel
-  "settings.public.allowMerchantSignup": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // Deprecated - no longer used in any marketplace considerations
-  // marketplace is enabled and disabled via the package
-  // seller signup is controlled by the allowMerchantSignup setting
-  "settings.public.allowGuestSellers": {
-    type: Boolean,
-    defaultValue: false
-  },
-  "settings.public.marketplaceNakedRoutes": {
-    type: Boolean,
-    defaultValue: true
-  },
-  // if true, permit each merchant to setup their own payment provider
-  "settings.public.perMerchantPaymentProviders": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // if true, the cart should be different for each merchant
-  "settings.public.merchantCart": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // if true, each merchant sets their own currency
-  // TODO: REMOVE in favor of merchantLocale
-  // "settings.public.merchantCurrency": {
-  //   type: Boolean,
-  //   defaultValue: false
-  // },
-  // if true, each merchant performs their own fulfillment
-  "settings.public.merchantFulfillment": {
-    type: Boolean,
-    defaultValue: true
-  },
-  // if true, each merchant sets their own language
-  // // TODO: REMOVE in favor of merchantLocale
-  // "settings.public.merchantLanguage": { // DEPRECATED
-  //   type: Boolean,
-  //   defaultValue: false
-  // },
-  // if true, each merchant sets their own locale, language, and currency
-  "settings.public.merchantLocale": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // if true, permit each merchant to setup their own shipping rates
-  "settings.public.merchantShippingRates": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // if true, each merchant sets their own currency
-  "settings.public.merchantTheme": {
-    type: Boolean,
-    defaultValue: false
-  }
-});
-
-registerSchema("MarketplacePackageConfig", MarketplacePackageConfig);
-
-/**
- * @name SellerShop
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary SellerShop schema
- */
-export const SellerShop = Shop.clone().extend({
-  stripeConnectSettings: {
-    type: Object,
-    optional: true
-  }
-});
-
-registerSchema("SellerShop", SellerShop);
diff --git a/imports/plugins/included/marketplace/lib/collections/schemas/stripe.js b/imports/plugins/included/marketplace/lib/collections/schemas/stripe.js
deleted file mode 100644
index ba438d905d..0000000000
--- a/imports/plugins/included/marketplace/lib/collections/schemas/stripe.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import SimpleSchema from "simpl-schema";
-import { check } from "meteor/check";
-import { Tracker } from "meteor/tracker";
-import { PackageConfig } from "/lib/collections/schemas";
-import { registerSchema } from "@reactioncommerce/schemas";
-
-/**
- * @name StripeConnectAuthorizationCredentials
- * @memberof Schemas
- * @type {SimpleSchema}
- * @see {@link https://stripe.com/docs/api}
- */
-const StripeConnectAuthorizationCredentials = new SimpleSchema({
-  token_type: { // eslint-disable-line camelcase
-    type: String
-  },
-  stripe_publishable_key: { // eslint-disable-line camelcase
-    type: String
-  },
-  scope: {
-    type: String
-  },
-  livemode: {
-    type: Boolean
-  },
-  stripe_user_id: { // eslint-disable-line camelcase
-    type: String
-  },
-  refresh_token: { // eslint-disable-line camelcase
-    type: String
-  },
-  access_token: { // eslint-disable-line camelcase
-    type: String
-  }
-}, { check, tracker: Tracker });
-
-/**
- * @name StripeMarketplacePackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- */
-export const StripeMarketplacePackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.mode": {
-    type: Boolean,
-    defaultValue: false
-  },
-  "settings.api_key": {
-    type: String,
-    label: "API Secret Key"
-  },
-  // This field only applies to marketplace style orders where a payment is taken on behalf of another store
-  "settings.applicationFee": {
-    type: Number,
-    label: "Percentage Application Fee",
-    optional: true,
-    defaultValue: 5
-  },
-  "settings.connectAuth": {
-    type: StripeConnectAuthorizationCredentials,
-    label: "Connect Authorization Credentials",
-    optional: true
-  },
-  "settings.public": {
-    type: Object,
-    defaultValue: {}
-  },
-  // Public Settings
-  "settings.public.client_id": {
-    type: String,
-    label: "Public Client ID",
-    optional: true
-  },
-  "settings.public.publishable_key": {
-    type: String,
-    label: "Publishable Key",
-    optional: true
-  }
-});
-
-registerSchema("StripeMarketplacePackageConfig", StripeMarketplacePackageConfig);
diff --git a/imports/plugins/included/marketplace/lib/constants.js b/imports/plugins/included/marketplace/lib/constants.js
deleted file mode 100644
index 0ac48f73b5..0000000000
--- a/imports/plugins/included/marketplace/lib/constants.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-export const SHOP_WORKFLOW_STATUS_ACTIVE = "active";
-export const SHOP_WORKFLOW_STATUS_DISABLED = "disabled";
-export const SHOP_WORKFLOW_STATUS_ARCHIVED = "archived";
diff --git a/imports/plugins/included/marketplace/server/index.js b/imports/plugins/included/marketplace/server/index.js
deleted file mode 100644
index 695d8c2b1e..0000000000
--- a/imports/plugins/included/marketplace/server/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "./methods";
-import "./stripe-connect";
-import "./publications";
diff --git a/imports/plugins/included/marketplace/server/methods.js b/imports/plugins/included/marketplace/server/methods.js
deleted file mode 100644
index b6cc3c471c..0000000000
--- a/imports/plugins/included/marketplace/server/methods.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import { check } from "meteor/check";
-import { Reaction } from "/lib/api";
-import ReactionError from "@reactioncommerce/reaction-error";
-import { Shops } from "/lib/collections";
-import { SHOP_WORKFLOW_STATUS_ACTIVE, SHOP_WORKFLOW_STATUS_DISABLED } from "../lib/constants";
-
-const status = [
-  SHOP_WORKFLOW_STATUS_ACTIVE,
-  SHOP_WORKFLOW_STATUS_DISABLED
-];
-
-/**
- * @param {String} shopId shopId
- * @param {String} workflowStatus workflow Status
- * @returns {undefined}
- */
-export function marketplaceUpdateShopWorkflow(shopId, workflowStatus) {
-  check(shopId, String);
-  check(workflowStatus, String);
-
-  if (shopId === Reaction.getPrimaryShopId()) {
-    throw new ReactionError("access-denied", "Cannot change shop status");
-  }
-
-  if (!Reaction.hasPermission("admin", this.userId, Reaction.getPrimaryShopId())) {
-    throw new ReactionError("access-denied", "Cannot change shop status");
-  }
-
-  if (status.includes(workflowStatus)) {
-    try {
-      return Shops.update({
-        _id: shopId
-      }, {
-        $set: {
-          "workflow.status": workflowStatus
-        }
-      });
-    } catch (error) {
-      throw new ReactionError("server-error", error.message);
-    }
-  }
-
-  throw new ReactionError("server-error", "Workflow status could not be updated, should be 'active' or 'disabled'");
-}
-
-Meteor.methods({
-  "marketplace/updateShopWorkflow": marketplaceUpdateShopWorkflow
-});
diff --git a/imports/plugins/included/marketplace/server/publications.js b/imports/plugins/included/marketplace/server/publications.js
deleted file mode 100644
index 502dcaf667..0000000000
--- a/imports/plugins/included/marketplace/server/publications.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import _ from "lodash";
-import { Meteor } from "meteor/meteor";
-import { check, Match } from "meteor/check";
-import { Reaction } from "/lib/api";
-import { Shops } from "/lib/collections";
-
-
-Meteor.publish("SellerShops", function (shopIds) {
-  check(shopIds, Match.Optional([String]));
-
-  const sellerShopId = Reaction.getSellerShopId(this.userId, true);
-
-  // sub publication for all shops that don't belong to current user
-  const sellerShopsSubPub = () => {
-    const selector = {};
-
-    if (shopIds) {
-      if (sellerShopId) {
-        const pubShopIds = _.without(shopIds, sellerShopId);
-        selector._id = { $in: pubShopIds };
-      }
-    } else if (sellerShopId) {
-      selector._id = { $ne: sellerShopId };
-    }
-
-    const sellerShopsObserver = Shops.find(selector, {
-      fields: { paymentMethods: 0 }
-    }).observe({
-      added: (document) => {
-        this.added("SellerShops", document._id, document);
-      },
-      changed: (document) => {
-        this.changed("SellerShops", document._id, document);
-      },
-      removed: (document) => {
-        this.removed("SellerShops", document._id);
-      }
-    });
-
-    this.onStop(() => {
-      sellerShopsObserver.stop();
-    });
-  };
-
-  // subPublication for the owner of the shop
-  const ownedSellerShopSubPub = () => {
-    const ownedSellerShopObserver = Shops.find({ _id: sellerShopId }).observe({
-      added: (document) => {
-        this.added("SellerShops", document._id, document);
-      },
-      changed: (document) => {
-        this.changed("SellerShops", document._id, document);
-      },
-      removed: (document) => {
-        this.removed("SellerShops", document._id);
-      }
-    });
-    this.onStop(() => {
-      ownedSellerShopObserver.stop();
-    });
-  };
-
-  if (sellerShopId && (!shopIds || shopIds.includes(sellerShopId))) {
-    ownedSellerShopSubPub();
-  }
-
-  // if we aren't try to get only the shop of the current logged-in seller
-  if (!(sellerShopId && shopIds && shopIds.length === 1 && sellerShopId === shopIds[0])) {
-    sellerShopsSubPub();
-  }
-
-  this.ready();
-});
diff --git a/imports/plugins/included/marketplace/server/stripe-connect.js b/imports/plugins/included/marketplace/server/stripe-connect.js
deleted file mode 100644
index 2a7195c667..0000000000
--- a/imports/plugins/included/marketplace/server/stripe-connect.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import Logger from "@reactioncommerce/logger";
-import { Meteor } from "meteor/meteor";
-import { HTTP } from "meteor/http";
-import { check } from "meteor/check";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import ReactionError from "@reactioncommerce/reaction-error";
-import { Packages } from "/lib/collections";
-
-export const methods = {
-  // separate url into params
-  // save params into sellerShop collection
-  "stripe/connect/authorizeMerchant"(shopId, authCode) {
-    check(shopId, String);
-    check(authCode, String);
-
-    if (!Reaction.hasPermission(["owner", "admin", "reaction-stripe"], Reaction.getUserId(), shopId)) {
-      Logger.warn(`user: ${Reaction.getUserId()} attempted to authorize merchant account
-        for shopId ${shopId} but was denied access due to insufficient privileges.`);
-      throw new ReactionError("access-denied", "Access Denied");
-    }
-
-    let result;
-    const primaryShopId = Reaction.getPrimaryShopId();
-    const stripePkg = Packages.findOne({
-      shopId: primaryShopId,
-      name: "reaction-stripe"
-    });
-
-    if (!stripePkg || !stripePkg.settings || !stripePkg.settings.api_key) {
-      throw new ReactionError("invalid-parameters", "Cannot authorize stripe connect merchant. Primary shop stripe must be configured.");
-    }
-
-    const merchantStripePkg = Packages.findOne({
-      shopId,
-      name: "reaction-stripe"
-    });
-
-    if (merchantStripePkg &&
-        merchantStripePkg.settings &&
-        merchantStripePkg.settings.connectAuth &&
-        typeof merchantStripePkg.settings.connectAuth.stripe_user_id === "string") {
-      return true;
-    }
-
-
-    const apiKey = stripePkg.settings.api_key;
-    const stripeAuthUrl = "https://connect.stripe.com/oauth/token";
-    try {
-      result = HTTP.call("POST", stripeAuthUrl, {
-        params: {
-          client_secret: apiKey, // eslint-disable-line camelcase
-          code: authCode,
-          grant_type: "authorization_code" // eslint-disable-line camelcase
-        }
-      });
-
-      if (result.error) {
-        throw new ReactionError("There was a problem authorizing stripe connect", result.error, result.error_description);
-      }
-
-      if (result && result.data) {
-        // Setup connectAuth settings for this merchant
-        Packages.update({ _id: merchantStripePkg._id }, {
-          $set: {
-            "settings.connectAuth": result.data
-          }
-        });
-      }
-    } catch (error) {
-      Logger.error(error);
-      result = { error };
-    }
-    return result;
-  }
-};
-
-Meteor.methods(methods);
diff --git a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js b/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
index 5a172b1e59..f4e856fbb6 100644
--- a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
+++ b/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
@@ -61,8 +61,11 @@ ExampleSettingsFormContainer.propTypes = {
 };
 
 const composer = (props, onData) => {
-  const subscription = Meteor.subscribe("Packages", Reaction.getShopId());
-  if (subscription.ready()) {
+  const shopId = Reaction.getShopId();
+  if (!shopId) return;
+
+  const pkgSub = Meteor.subscribe("Packages", shopId);
+  if (pkgSub.ready()) {
     const packageData = Packages.findOne({
       name: "example-paymentmethod",
       shopId: Reaction.getShopId()
diff --git a/imports/plugins/included/product-admin/client/components/ProductHeader.js b/imports/plugins/included/product-admin/client/components/ProductHeader.js
index f23485c3bc..6c2836d4ff 100644
--- a/imports/plugins/included/product-admin/client/components/ProductHeader.js
+++ b/imports/plugins/included/product-admin/client/components/ProductHeader.js
@@ -74,14 +74,14 @@ function ProductHeader(props) {
       title={i18next.t("admin.productTable.bulkActions.archiveTitle")}
       message={i18next.t("productDetailEdit.archiveThisProduct")}
       onConfirm={() => {
-        let redirectUrl = "/operator/products";
+        let redirectUrl = "/products";
 
         if (parentVariant) {
-          redirectUrl = `/operator/products/${product._id}/${parentVariant._id}`;
+          redirectUrl = `/products/${product._id}/${parentVariant._id}`;
         } else if (variant) {
-          redirectUrl = `/operator/products/${product._id}`;
+          redirectUrl = `/products/${product._id}`;
         } else {
-          redirectUrl = "/operator/products";
+          redirectUrl = "/products";
         }
 
         onArchiveProduct(currentProduct, redirectUrl);
@@ -113,9 +113,9 @@ function ProductHeader(props) {
   return (
     <div className={classes.root}>
       <div className={classes.breadcrumbs}>
-        <Link className={classes.breadcrumbLink} to="/operator/products">{"Products"}</Link>
+        <Link className={classes.breadcrumbLink} to="/products">{"Products"}</Link>
         <ChevronRight className={classes.breadcrumbIcon} />
-        <Link className={classes.breadcrumbLink} to={`/operator/products/${product._id}`}>
+        <Link className={classes.breadcrumbLink} to={`/products/${product._id}`}>
           {product.title || "Untitled Product"}
         </Link>
 
@@ -124,7 +124,7 @@ function ProductHeader(props) {
             <ChevronRight className={classes.breadcrumbIcon} />
             <Link
               className={classes.breadcrumbLink}
-              to={`/operator/products/${product._id}/${parentVariant._id}`}
+              to={`/products/${product._id}/${parentVariant._id}`}
             >
               {parentVariant.optionTitle || parentVariant.title || "Untitled Variant"}
             </Link>
@@ -136,7 +136,7 @@ function ProductHeader(props) {
             <ChevronRight className={classes.breadcrumbIcon} />
             <Link
               className={classes.breadcrumbLink}
-              to={`/operator/products/${variant.ancestors.join("/")}/${variant._id}`}
+              to={`/products/${variant.ancestors.join("/")}/${variant._id}`}
             >
               {variant.optionTitle || variant.title || "Untitled Variant"}
             </Link>
diff --git a/imports/plugins/included/product-admin/client/components/ProductList.js b/imports/plugins/included/product-admin/client/components/ProductList.js
index f21f30c9ee..981183bb11 100644
--- a/imports/plugins/included/product-admin/client/components/ProductList.js
+++ b/imports/plugins/included/product-admin/client/components/ProductList.js
@@ -18,16 +18,16 @@ import { Reaction } from "/client/api";
 function getURL(item) {
   // Top level product
   if (item.type === "simple") {
-    return `/operator/products/${item._id}`;
+    return `/products/${item._id}`;
   }
 
   // Variant
   if (item.ancestors.length === 1) {
-    return `/operator/products/${item.ancestors[0]}/${item._id}`;
+    return `/products/${item.ancestors[0]}/${item._id}`;
   }
 
   // Option
-  return `/operator/products/${item.ancestors[0]}/${item.ancestors[1]}/${item._id}`;
+  return `/products/${item.ancestors[0]}/${item.ancestors[1]}/${item._id}`;
 }
 
 /**
diff --git a/imports/plugins/included/product-admin/client/components/ProductTable.js b/imports/plugins/included/product-admin/client/components/ProductTable.js
index 726ed98c7e..f5c78f6048 100644
--- a/imports/plugins/included/product-admin/client/components/ProductTable.js
+++ b/imports/plugins/included/product-admin/client/components/ProductTable.js
@@ -153,7 +153,7 @@ function ProductTable({ history }) {
       const { createProduct: { product } } = data;
       const { id: decodedId } = decodeOpaqueId(product._id);
 
-      history.push(`/operator/products/${decodedId}`);
+      history.push(`/products/${decodedId}`);
     }
   };
 
diff --git a/imports/plugins/included/product-admin/client/components/VariantTable.js b/imports/plugins/included/product-admin/client/components/VariantTable.js
index f13f03d063..acd2c12d32 100644
--- a/imports/plugins/included/product-admin/client/components/VariantTable.js
+++ b/imports/plugins/included/product-admin/client/components/VariantTable.js
@@ -32,16 +32,16 @@ const styles = () => ({
 function getURL(item) {
   // Top level product
   if (item.type === "simple") {
-    return `/operator/products/${item._id}`;
+    return `/products/${item._id}`;
   }
 
   // Variant
   if (item.ancestors.length === 1) {
-    return `/operator/products/${item.ancestors[0]}/${item._id}`;
+    return `/products/${item.ancestors[0]}/${item._id}`;
   }
 
   // Option
-  return `/operator/products/${item.ancestors[0]}/${item.ancestors[1]}/${item._id}`;
+  return `/products/${item.ancestors[0]}/${item.ancestors[1]}/${item._id}`;
 }
 
 /**
diff --git a/imports/plugins/included/product-variant/components/productGridItems.js b/imports/plugins/included/product-variant/components/productGridItems.js
index 6496afb388..74e8f86bca 100644
--- a/imports/plugins/included/product-variant/components/productGridItems.js
+++ b/imports/plugins/included/product-variant/components/productGridItems.js
@@ -135,7 +135,7 @@ class ProductGridItems extends Component {
           {this.renderMedia()}
         </TableCell>
         <TableCell>
-          <Link to={`/operator/products/${product._id}`}>{product.title}</Link>
+          <Link to={`/products/${product._id}`}>{product.title}</Link>
         </TableCell>
         <TableCell>
           {product._id}
diff --git a/imports/plugins/included/product-variant/containers/productGridItemsContainer.js b/imports/plugins/included/product-variant/containers/productGridItemsContainer.js
index 4f43896192..36093a0851 100644
--- a/imports/plugins/included/product-variant/containers/productGridItemsContainer.js
+++ b/imports/plugins/included/product-variant/containers/productGridItemsContainer.js
@@ -29,7 +29,7 @@ const wrapComponent = (Comp) => (
         if (this.props.product.__published) {
           ({ handle } = this.props.product.__published);
         }
-        return `/operator/products/${handle}`;
+        return `/products/${handle}`;
       }
 
       return "/";
@@ -70,7 +70,7 @@ const wrapComponent = (Comp) => (
     onDoubleClick = () => {
       const { product, history } = this.props;
 
-      history.push(`/operator/products/${product._id}`);
+      history.push(`/products/${product._id}`);
 
       // Open actionView to productDetails panel
       Reaction.state.set("edit/focus", "productDetails");
@@ -91,7 +91,7 @@ const wrapComponent = (Comp) => (
       const { product, history } = this.props;
 
       if (this.props.isSearch) {
-        history.push(`/operator/products/${product._id}`);
+        history.push(`/products/${product._id}`);
         this.props.unmountMe();
         return;
       }
diff --git a/lib/api/core.js b/lib/api/core.js
index 5717dc51bf..bba55233d6 100644
--- a/lib/api/core.js
+++ b/lib/api/core.js
@@ -1,7 +1,4 @@
-import { isEqual } from "lodash";
 import { Meteor } from "meteor/meteor";
-import { Roles } from "meteor/alanning:roles";
-import { Accounts, Shops, SellerShops } from "/lib/collections";
 
 let Reaction;
 
@@ -13,97 +10,6 @@ if (Meteor.isServer) {
   ({ Reaction } = require("/client/api"));
 }
 
-/**
- * @method isPackageEnabled
- * @memberof Core
- * @summary Check if package is enabled
- * @example Reaction.isPackageEnabled()
- * @param  {String}  name - Package name
- * @returns {Boolean}      True if the package is enabled
- */
-function isPackageEnabled(name) {
-  const settings = this.getPackageSettings(name);
-
-  return !!(settings && settings.enabled);
-}
-
-/**
- * @method getSeller
- * @memberof Core
- * @example Reaction.getSeller(shopId)
- * @param  {String} shopId ID of shop
- * @returns {Object}        Account object of seller
- */
-function getSeller(shopId) {
-  let sellerShopId;
-
-  if (!shopId) {
-    const currentUser = Meteor.user();
-    if (currentUser) {
-      [sellerShopId] = Roles.getGroupsForUser(currentUser.id, "admin");
-    }
-  } else {
-    sellerShopId = shopId;
-  }
-
-  return Accounts.findOne({ shopId: sellerShopId });
-}
-
-/**
- * @method getSellerShopId
- * @memberof Core
- * @summary Get a seller's shopId or default to parent shopId
- * @example Reaction.getSellerShopId(this.userId, true)
- * @param {String|Object} user - An optional user hash or userId to find a shop for
- * @param {Boolean} [noFallback=false] - Optional.If set to true doesn't fallback to owner shopId
- * when user doesn't have a shop.
- * @returns {String|Boolean} - The shopId belonging to userId, or loggedIn seller, or the parent shopId
- */
-function getSellerShopId(user, noFallback = false) {
-  let seller = user;
-
-  if (Meteor.isClient && !seller) {
-    seller = Meteor.user();
-  }
-
-  if (seller) {
-    const group = Roles.getGroupsForUser(seller, "admin")[0];
-    if (group) {
-      return group;
-    }
-  }
-
-
-  if (noFallback) {
-    return false;
-  }
-
-  return Reaction.getShopId();
-}
-
-/**
- * @method getSellerShop
- * @memberof Core
- * @summary Get a seller's shop or default to parent shop
- * @param {String|Object} user - An optional user hash or userId to find a shop for
- * @param {Boolean} [noFallback=false] - Optional.If set to true doesn't fallback to owner shop
- * when user doesn't have a shop.
- * @returns {String|Boolean} - The shop hash belonging to userId, or loggedIn seller, or the parent shop
- */
-function getSellerShop(user, noFallback = false) {
-  const _id = getSellerShopId(user, noFallback);
-
-  if (!_id) {
-    return false;
-  }
-
-  if (Meteor.isClient && _id !== Reaction.getShopId()) {
-    return SellerShops.findOne({ _id });
-  }
-
-  return Shops.findOne({ _id });
-}
-
 /**
   * @summary gets shopIds of shops where user has provided permissions
   * @param {Array} roles - roles to check if user has
@@ -140,25 +46,8 @@ function getShopsForUser(roles, userId = Reaction.getUserId()) {
   return shopIdsWithRoles;
 }
 
-/**
-  * @summary return if the user has permissions for all the shops
-  * @param {Array} roles - roles to check if user has
-  * @param {String} userId - userId to check permissions for (defaults to current user)
-  * @param {Array} shopsOfUser - shopIds to be checked
-  * @returns {Boolean} - true if the user has permissions for all the shops
-  * @private
-  */
-function hasPermissionForAll(roles, userId = Reaction.getUserId(), shopsOfUser) {
-  return !isEqual(getShopsForUser(["admin"], userId), shopsOfUser);
-}
-
 const NewReaction = Object.assign(Reaction, {
-  isPackageEnabled,
-  getSeller,
-  getSellerShopId,
-  getSellerShop,
-  getShopsForUser,
-  hasPermissionForAll
+  getShopsForUser
 });
 
 export { NewReaction as Reaction };