diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d7782dcc211..e01aa0412e3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,6 +29,14 @@ repos:
         entry: yarn run lint-frontend:format
         language: system
         files: \.(js|vue|scss|css)$
+-   repo: local
+    hooks:
+    -   id: core-js-api
+        name: Rebuild kolibri package
+        description: Rebuilds kolibri package on changes to core js api
+        entry: yarn run build-kolibri-tools
+        language: system
+        files: ^packages/kolibri/.*\.(js|vue)$
 - repo: local
   hooks:
   - id: no-auto-migrations
@@ -75,6 +83,12 @@ repos:
     entry: settings\.AUTH_USER_MODEL
     language: pygrep
     files: migrations/.*\.py$
+  - id: no-kolibri-common-imports
+    name: No imports from kolibri-common (which is unpublished) in any other packages
+    entry: kolibri-common
+    language: pygrep
+    exclude: (^packages/kolibri-common/|moduleMapping\.js|test/fixtures)
+    files: ^packages/.*\.(js|vue)$
 -   repo: https://github.com/isidentical/teyit
     rev: 0.4.3
     hooks:
diff --git a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue
index 7e058809359..0ca95550775 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue
+++ b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue
@@ -81,7 +81,7 @@
 <script>
 
   import { mapGetters, mapState } from 'vuex';
-  import TechnicalTextBlock from 'kolibri-common/components/AppError/TechnicalTextBlock';
+  import TechnicalTextBlock from 'kolibri/components/error/TechnicalTextBlock';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import useSnackbar from 'kolibri/composables/useSnackbar';
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index def22419c3f..63f28573559 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -119,8 +119,8 @@
   import TaskResource from 'kolibri/apiResources/TaskResource';
   import FacilityResource from 'kolibri-common/apiResources/FacilityResource';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
-  import CoreMenu from 'kolibri-common/components/CoreMenu';
-  import CoreMenuOption from 'kolibri-common/components/CoreMenu/CoreMenuOption';
+  import CoreMenu from 'kolibri/components/CoreMenu';
+  import CoreMenuOption from 'kolibri/components/CoreMenu/CoreMenuOption';
   import { TaskStatuses } from 'kolibri-common/utils/syncTaskUtils';
   import { SyncPageNames } from 'kolibri-common/components/SyncSchedule/constants';
   import PrivacyModal from './PrivacyModal';
diff --git a/kolibri/plugins/learn/assets/src/views/BrowseResourceMetadata.vue b/kolibri/plugins/learn/assets/src/views/BrowseResourceMetadata.vue
index f7056483eda..49a33d859cd 100644
--- a/kolibri/plugins/learn/assets/src/views/BrowseResourceMetadata.vue
+++ b/kolibri/plugins/learn/assets/src/views/BrowseResourceMetadata.vue
@@ -234,7 +234,7 @@
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import camelCase from 'lodash/camelCase';
   import { ContentLevels } from 'kolibri/constants';
-  import DownloadButton from 'kolibri-common/components/DownloadButton';
+  import DownloadButton from 'kolibri/components/DownloadButton';
   import get from 'lodash/get';
   import {
     licenseShortName,
diff --git a/kolibri/plugins/learn/assets/src/views/ChannelRenderer/ContentModal.vue b/kolibri/plugins/learn/assets/src/views/ChannelRenderer/ContentModal.vue
index 55aa7bd5c72..33e2b3a7490 100644
--- a/kolibri/plugins/learn/assets/src/views/ChannelRenderer/ContentModal.vue
+++ b/kolibri/plugins/learn/assets/src/views/ChannelRenderer/ContentModal.vue
@@ -41,7 +41,7 @@
 <script>
 
   import KToolbar from 'kolibri-design-system/lib/KToolbar';
-  import Backdrop from 'kolibri-common/components/Backdrop';
+  import Backdrop from 'kolibri/components/Backdrop';
   import ContentItem from './ContentItem';
 
   export default {
diff --git a/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue b/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue
index dc64e7fe757..ea96826196d 100644
--- a/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue
+++ b/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue
@@ -147,7 +147,7 @@
   import camelCase from 'lodash/camelCase';
 
   import LearnerNeeds from 'kolibri-constants/labels/Needs';
-  import DownloadButton from 'kolibri-common/components/DownloadButton';
+  import DownloadButton from 'kolibri/components/DownloadButton';
   import TimeDuration from 'kolibri-common/components/TimeDuration';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import get from 'lodash/get';
diff --git a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
index 6cda6b3b36a..347010592e9 100644
--- a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
+++ b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/HybridLearningFooter.vue
@@ -96,8 +96,8 @@
 
   import CoachContentLabel from 'kolibri-common/components/labels/CoachContentLabel';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
-  import CoreMenu from 'kolibri-common/components/CoreMenu';
-  import CoreMenuOption from 'kolibri-common/components/CoreMenu/CoreMenuOption';
+  import CoreMenu from 'kolibri/components/CoreMenu';
+  import CoreMenuOption from 'kolibri/components/CoreMenu/CoreMenuOption';
   import useUser from 'kolibri/composables/useUser';
   import ProgressBar from '../ProgressBar';
   import commonLearnStrings from '../commonLearnStrings';
diff --git a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
index 7522b46abca..259596a863d 100644
--- a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
+++ b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
@@ -181,9 +181,9 @@
 
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import CoachContentLabel from 'kolibri-common/components/labels/CoachContentLabel';
-  import CoreMenu from 'kolibri-common/components/CoreMenu';
+  import CoreMenu from 'kolibri/components/CoreMenu';
   import { ContentNodeKinds } from 'kolibri/constants';
-  import CoreMenuOption from 'kolibri-common/components/CoreMenu/CoreMenuOption';
+  import CoreMenuOption from 'kolibri/components/CoreMenu/CoreMenuOption';
   import ProgressIcon from 'kolibri-common/components/labels/ProgressIcon';
   import KToolbar from 'kolibri-design-system/lib/KToolbar';
   import { validateLearningActivity } from 'kolibri/utils/validators';
diff --git a/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue b/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue
index 80bed082353..8937efd7a0a 100644
--- a/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue
+++ b/kolibri/plugins/learn/assets/src/views/ResourceSyncingUiAlert.vue
@@ -17,7 +17,7 @@
   import { get } from '@vueuse/core';
   import { computed, watch } from '@vue/composition-api';
   import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert.vue';
-  import useUserSyncStatus from 'kolibri-common/composables/useUserSyncStatus';
+  import useUserSyncStatus from 'kolibri/composables/useUserSyncStatus';
   import { SyncStatus } from 'kolibri/constants';
   import { createTranslator } from 'kolibri/utils/i18n';
   import useUser from 'kolibri/composables/useUser';
diff --git a/kolibri/plugins/learn/assets/src/views/StorageNotification.vue b/kolibri/plugins/learn/assets/src/views/StorageNotification.vue
index eed9df42839..aa33028fedc 100644
--- a/kolibri/plugins/learn/assets/src/views/StorageNotification.vue
+++ b/kolibri/plugins/learn/assets/src/views/StorageNotification.vue
@@ -64,7 +64,7 @@
   import { LearnerDeviceStatus } from 'kolibri/constants';
   import urls from 'kolibri/urls';
   import redirectBrowser from 'kolibri/utils/redirectBrowser';
-  import useUserSyncStatus from 'kolibri-common/composables/useUserSyncStatus';
+  import useUserSyncStatus from 'kolibri/composables/useUserSyncStatus';
 
   export default {
     name: 'StorageNotification',
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
index 82a28129e6f..ec7bd481854 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -169,8 +169,8 @@
   import samePageCheckGenerator from 'kolibri-common/utils/samePageCheckGenerator';
   import client from 'kolibri/client';
   import urls from 'kolibri/urls';
-  import AppError from 'kolibri-common/components/AppError';
-  import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
+  import AppError from 'kolibri/components/error/AppError';
+  import GlobalSnackbar from 'kolibri/components/GlobalSnackbar';
   import LearningActivityChip from 'kolibri-common/components/ResourceDisplayAndSearch/LearningActivityChip.vue';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import useChannels from 'kolibri-common/composables/useChannels';
diff --git a/kolibri/plugins/perseus_viewer/assets/src/views/Tex.js b/kolibri/plugins/perseus_viewer/assets/src/views/Tex.js
index 3a1dc919ff9..c03083660cc 100644
--- a/kolibri/plugins/perseus_viewer/assets/src/views/Tex.js
+++ b/kolibri/plugins/perseus_viewer/assets/src/views/Tex.js
@@ -13,7 +13,7 @@ import PropTypes from 'prop-types';
 import katex from 'katex';
 import katexA11y from 'katex/dist/contrib/render-a11y-string';
 import createReactClass from 'create-react-class';
-import scriptLoader from 'kolibri-common/utils/scriptLoader';
+import scriptLoader from 'kolibri/utils/scriptLoader';
 import urls from 'kolibri/urls';
 
 let pendingScripts = [];
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/OnboardingStepBase.vue b/kolibri/plugins/setup_wizard/assets/src/views/OnboardingStepBase.vue
index 7d72bbac5f3..1b27c5a2ba9 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/OnboardingStepBase.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/OnboardingStepBase.vue
@@ -160,7 +160,7 @@
   import CoreLogo from 'kolibri/components/CoreLogo';
   import LanguageSwitcherModal from 'kolibri/components/language-switcher/LanguageSwitcherModal';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
-  import AppError from 'kolibri-common/components/AppError';
+  import AppError from 'kolibri/components/error/AppError';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import { availableLanguages, currentLanguage } from 'kolibri/utils/i18n';
   import { FooterMessageTypes } from '../constants';
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/PersonalDataConsentForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/PersonalDataConsentForm.vue
index e7965036f31..42a3faae5fb 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/PersonalDataConsentForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/PersonalDataConsentForm.vue
@@ -30,7 +30,7 @@
 
 <script>
 
-  import PrivacyInfoModal from 'kolibri-common/components/PrivacyInfoModal';
+  import PrivacyInfoModal from 'kolibri/components/PrivacyInfoModal';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import OnboardingStepBase from '../OnboardingStepBase';
   import { FooterMessageTypes } from '../../constants';
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
index 2c24083d71c..f989c86b3ad 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue
@@ -38,7 +38,7 @@
 
   import omitBy from 'lodash/omitBy';
   import get from 'lodash/get';
-  import AppError from 'kolibri-common/components/AppError';
+  import AppError from 'kolibri/components/error/AppError';
   import { currentLanguage } from 'kolibri/utils/i18n';
   import { checkCapability } from 'kolibri/utils/appCapabilities';
   import redirectBrowser from 'kolibri/utils/redirectBrowser';
diff --git a/kolibri/plugins/user_auth/assets/src/views/AuthBase.vue b/kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
index 61ee917eb84..3e1c89ed642 100644
--- a/kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
@@ -181,7 +181,7 @@
 
   import { mapGetters } from 'vuex';
   import CoreLogo from 'kolibri/components/CoreLogo';
-  import PrivacyInfoModal from 'kolibri-common/components/PrivacyInfoModal';
+  import PrivacyInfoModal from 'kolibri/components/PrivacyInfoModal';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import useUser from 'kolibri/composables/useUser';
   import themeConfig from 'kolibri/styles/themeConfig';
diff --git a/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue b/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
index 5e73ce4c809..6dd5b1b7875 100644
--- a/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
@@ -50,8 +50,8 @@
   import AuthMessage from 'kolibri/components/AuthMessage';
   import coreBannerContent from 'kolibri-common/utils/coreBannerContent';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
-  import AppError from 'kolibri-common/components/AppError';
-  import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
+  import AppError from 'kolibri/components/error/AppError';
+  import GlobalSnackbar from 'kolibri/components/GlobalSnackbar';
   import { ComponentMap } from '../constants';
   import CoreBanner from './CoreBanner';
 
diff --git a/packages/kolibri-common/components/CoreMenu/CoreMenuDivider.vue b/packages/kolibri-common/components/CoreMenu/CoreMenuDivider.vue
deleted file mode 100644
index e4db9be13fd..00000000000
--- a/packages/kolibri-common/components/CoreMenu/CoreMenuDivider.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-
-  <li>
-    <span
-      class="divider"
-      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
-    >
-    </span>
-  </li>
-
-</template>
-
-
-<script>
-
-  export default {
-    name: 'CoreMenuDivider',
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .divider {
-    display: block;
-    min-width: 100%;
-    height: 1px;
-    margin: 8px 0;
-    overflow-y: hidden;
-  }
-
-</style>
diff --git a/packages/kolibri-common/components/CoreMenu/__tests__/CoreMenuDivider.spec.js b/packages/kolibri-common/components/CoreMenu/__tests__/CoreMenuDivider.spec.js
deleted file mode 100644
index 650b1feb9b4..00000000000
--- a/packages/kolibri-common/components/CoreMenu/__tests__/CoreMenuDivider.spec.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { render, screen } from '@testing-library/vue';
-import CoreMenuDivider from '../CoreMenuDivider.vue';
-
-describe('CoreMenuDivider', () => {
-  test('renders the component', () => {
-    render(CoreMenuDivider);
-
-    expect(screen.getByRole('listitem')).toBeInTheDocument();
-  });
-});
diff --git a/packages/kolibri-common/components/SidePanelModal/index.vue b/packages/kolibri-common/components/SidePanelModal/index.vue
index 6dfd0da30cd..978faf87e51 100644
--- a/packages/kolibri-common/components/SidePanelModal/index.vue
+++ b/packages/kolibri-common/components/SidePanelModal/index.vue
@@ -67,7 +67,7 @@
 <script>
 
   import { get } from '@vueuse/core';
-  import Backdrop from 'kolibri-common/components/Backdrop';
+  import Backdrop from 'kolibri/components/Backdrop';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
 
diff --git a/packages/kolibri-common/components/userAccounts/PrivacyLinkAndModal.vue b/packages/kolibri-common/components/userAccounts/PrivacyLinkAndModal.vue
index bcad63000fe..acfa90977f5 100644
--- a/packages/kolibri-common/components/userAccounts/PrivacyLinkAndModal.vue
+++ b/packages/kolibri-common/components/userAccounts/PrivacyLinkAndModal.vue
@@ -19,7 +19,7 @@
 
 <script>
 
-  import PrivacyInfoModal from 'kolibri-common/components/PrivacyInfoModal';
+  import PrivacyInfoModal from 'kolibri/components/PrivacyInfoModal';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
 
   export default {
diff --git a/packages/kolibri-tools/lib/moduleMapping.js b/packages/kolibri-tools/lib/moduleMapping.js
index 76ff8478c6d..beaed792a4c 100644
--- a/packages/kolibri-tools/lib/moduleMapping.js
+++ b/packages/kolibri-tools/lib/moduleMapping.js
@@ -19,7 +19,7 @@ module.exports = {
   'kolibri.coreVue.components.Backdrop': 'kolibri-common/components/Backdrop',
   'kolibri.coreVue.components.CoachContentLabel':
     'kolibri-common/components/labels/CoachContentLabel',
-  'kolibri.coreVue.components.DownloadButton': 'kolibri-common/components/DownloadButton',
+  'kolibri.coreVue.components.DownloadButton': 'kolibri/components/DownloadButton',
   'kolibri.coreVue.components.ProgressBar': null, // Not used
   'kolibri.coreVue.components.ContentIcon': 'kolibri-common/components/labels/ContentIcon',
   'kolibri.coreVue.components.ProgressIcon': 'kolibri-common/components/labels/ProgressIcon',
@@ -41,10 +41,9 @@ module.exports = {
   'kolibri.coreVue.components.AuthMessage': 'kolibri/components/AuthMessage',
   'kolibri.coreVue.components.FilterTextbox': 'kolibri/components/FilterTextbox',
   'kolibri.coreVue.components.CoreSnackbar': null, // Only used in GlobalSnackbar
-  'kolibri.coreVue.components.CoreMenu': 'kolibri-common/components/CoreMenu',
-  'kolibri.coreVue.components.CoreMenuDivider':
-    'kolibri-common/components/CoreMenu/CoreMenuDivider',
-  'kolibri.coreVue.components.CoreMenuOption': 'kolibri-common/components/CoreMenu/CoreMenuOption',
+  'kolibri.coreVue.components.CoreMenu': 'kolibri/components/CoreMenu',
+  'kolibri.coreVue.components.CoreMenuDivider': null,
+  'kolibri.coreVue.components.CoreMenuOption': 'kolibri/components/CoreMenu/CoreMenuOption',
   'kolibri.coreVue.components.CoreTable': 'kolibri/components/CoreTable',
   'kolibri.coreVue.components.UserTable': 'kolibri-common/components/UserTable',
   'kolibri.coreVue.components.CoreInfoIcon': 'kolibri-common/components/labels/CoreInfoIcon',
@@ -58,7 +57,7 @@ module.exports = {
   'kolibri.coreVue.components.UiAlert': 'kolibri-design-system/lib/keen/UiAlert',
   'kolibri.coreVue.components.UiIconButton': 'kolibri-design-system/lib/keen/UiIconButton',
   'kolibri.coreVue.components.UiToolbar': 'kolibri-design-system/lib/KToolbar',
-  'kolibri.coreVue.components.PrivacyInfoModal': 'kolibri-common/components/PrivacyInfoModal',
+  'kolibri.coreVue.components.PrivacyInfoModal': 'kolibri/components/PrivacyInfoModal',
   'kolibri.coreVue.components.UserTypeDisplay': 'kolibri-common/components/UserTypeDisplay',
   'kolibri.coreVue.components.Draggable': 'kolibri-common/components/sortable/Draggable',
   'kolibri.coreVue.components.DragHandle': 'kolibri-common/components/sortable/DragHandle',
@@ -130,7 +129,7 @@ module.exports = {
     'kolibri/composables/useMinimumKolibriVersion',
   'kolibri.coreVue.composables.useSnackbar': 'kolibri/composables/useSnackbar',
   'kolibri.coreVue.composables.useUser': 'kolibri/composables/useUser',
-  'kolibri.coreVue.composables.useUserSyncStatus': 'kolibri-common/composables/useUserSyncStatus',
+  'kolibri.coreVue.composables.useUserSyncStatus': 'kolibri/composables/useUserSyncStatus',
   'kolibri.coreVue.composables.useNow': 'kolibri/composables/useNow',
   'kolibri.coreVue.composables.useTotalProgress': 'kolibri/composables/useTotalProgress',
   'kolibri.resources': {
diff --git a/packages/kolibri-common/components/Backdrop.vue b/packages/kolibri/components/Backdrop.vue
similarity index 100%
rename from packages/kolibri-common/components/Backdrop.vue
rename to packages/kolibri/components/Backdrop.vue
diff --git a/packages/kolibri-common/components/CoreMenu/CoreMenuOption.vue b/packages/kolibri/components/CoreMenu/CoreMenuOption.vue
similarity index 100%
rename from packages/kolibri-common/components/CoreMenu/CoreMenuOption.vue
rename to packages/kolibri/components/CoreMenu/CoreMenuOption.vue
diff --git a/packages/kolibri-common/components/CoreMenu/__tests__/CoreMenuOption.spec.js b/packages/kolibri/components/CoreMenu/__tests__/CoreMenuOption.spec.js
similarity index 100%
rename from packages/kolibri-common/components/CoreMenu/__tests__/CoreMenuOption.spec.js
rename to packages/kolibri/components/CoreMenu/__tests__/CoreMenuOption.spec.js
diff --git a/packages/kolibri-common/components/CoreMenu/index.vue b/packages/kolibri/components/CoreMenu/index.vue
similarity index 100%
rename from packages/kolibri-common/components/CoreMenu/index.vue
rename to packages/kolibri/components/CoreMenu/index.vue
diff --git a/packages/kolibri-common/components/DownloadButton.vue b/packages/kolibri/components/DownloadButton.vue
similarity index 94%
rename from packages/kolibri-common/components/DownloadButton.vue
rename to packages/kolibri/components/DownloadButton.vue
index 05b7a62fbb7..087a7b09d33 100644
--- a/packages/kolibri-common/components/DownloadButton.vue
+++ b/packages/kolibri/components/DownloadButton.vue
@@ -21,8 +21,8 @@
 <script>
 
   import useUser from 'kolibri/composables/useUser';
-  import { getFilePresetString } from '../uiText/filePresetStrings';
-  import { getRenderableFiles } from '../utils/contentViewer';
+  import { getRenderableFiles } from './internal/ContentRenderer/utils';
+  import { getFilePresetString } from './internal/filePresetStrings';
 
   export default {
     name: 'DownloadButton',
diff --git a/packages/kolibri-common/components/GlobalSnackbar/index.vue b/packages/kolibri/components/GlobalSnackbar/index.vue
similarity index 96%
rename from packages/kolibri-common/components/GlobalSnackbar/index.vue
rename to packages/kolibri/components/GlobalSnackbar/index.vue
index 478d22ddd29..21aeff0b89d 100644
--- a/packages/kolibri-common/components/GlobalSnackbar/index.vue
+++ b/packages/kolibri/components/GlobalSnackbar/index.vue
@@ -19,7 +19,7 @@
 <script>
 
   import useSnackbar from 'kolibri/composables/useSnackbar';
-  import CoreSnackbar from './CoreSnackbar';
+  import CoreSnackbar from './internal/CoreSnackbar';
 
   export default {
     name: 'GlobalSnackbar',
diff --git a/packages/kolibri-common/components/GlobalSnackbar/CoreSnackbar.vue b/packages/kolibri/components/GlobalSnackbar/internal/CoreSnackbar.vue
similarity index 98%
rename from packages/kolibri-common/components/GlobalSnackbar/CoreSnackbar.vue
rename to packages/kolibri/components/GlobalSnackbar/internal/CoreSnackbar.vue
index 892c9a3285b..991e34af521 100644
--- a/packages/kolibri-common/components/GlobalSnackbar/CoreSnackbar.vue
+++ b/packages/kolibri/components/GlobalSnackbar/internal/CoreSnackbar.vue
@@ -41,7 +41,7 @@
 <script>
 
   import UiSnackbar from 'kolibri-design-system/lib/keen/UiSnackbar.vue';
-  import Backdrop from 'kolibri-common/components/Backdrop';
+  import Backdrop from 'kolibri/components/Backdrop';
   import useSnackbar from 'kolibri/composables/useSnackbar';
 
   /* Snackbars are used to display notification. */
diff --git a/packages/kolibri-common/components/PrivacyInfoModal.vue b/packages/kolibri/components/PrivacyInfoModal.vue
similarity index 100%
rename from packages/kolibri-common/components/PrivacyInfoModal.vue
rename to packages/kolibri/components/PrivacyInfoModal.vue
diff --git a/packages/kolibri-common/components/__tests__/DownloadButton.spec.js b/packages/kolibri/components/__tests__/DownloadButton.spec.js
similarity index 100%
rename from packages/kolibri-common/components/__tests__/DownloadButton.spec.js
rename to packages/kolibri/components/__tests__/DownloadButton.spec.js
diff --git a/packages/kolibri-common/components/__tests__/download-button.spec.js b/packages/kolibri/components/__tests__/download-button.spec.js
similarity index 100%
rename from packages/kolibri-common/components/__tests__/download-button.spec.js
rename to packages/kolibri/components/__tests__/download-button.spec.js
diff --git a/packages/kolibri-common/components/AppError/index.vue b/packages/kolibri/components/error/AppError.vue
similarity index 100%
rename from packages/kolibri-common/components/AppError/index.vue
rename to packages/kolibri/components/error/AppError.vue
diff --git a/packages/kolibri-common/components/AppError/ReportErrorModal.vue b/packages/kolibri/components/error/ReportErrorModal.vue
similarity index 100%
rename from packages/kolibri-common/components/AppError/ReportErrorModal.vue
rename to packages/kolibri/components/error/ReportErrorModal.vue
diff --git a/packages/kolibri-common/components/AppError/TechnicalTextBlock.vue b/packages/kolibri/components/error/TechnicalTextBlock.vue
similarity index 100%
rename from packages/kolibri-common/components/AppError/TechnicalTextBlock.vue
rename to packages/kolibri/components/error/TechnicalTextBlock.vue
diff --git a/packages/kolibri-common/components/AppError/__test__/AppError.spec.js b/packages/kolibri/components/error/__tests__/AppError.spec.js
similarity index 97%
rename from packages/kolibri-common/components/AppError/__test__/AppError.spec.js
rename to packages/kolibri/components/error/__tests__/AppError.spec.js
index 6fa3549ad2f..d44a8229dd7 100644
--- a/packages/kolibri-common/components/AppError/__test__/AppError.spec.js
+++ b/packages/kolibri/components/error/__tests__/AppError.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
 import { coreStoreFactory as makeStore } from 'kolibri/store';
-import AppError from '../index.vue';
+import AppError from '../AppError';
 import coreModule from '../../../../../kolibri/core/assets/src/state/modules/core';
 
 function makeWrapper() {
diff --git a/packages/kolibri-common/components/AppError/app-error-bird.png b/packages/kolibri/components/error/app-error-bird.png
similarity index 100%
rename from packages/kolibri-common/components/AppError/app-error-bird.png
rename to packages/kolibri/components/error/app-error-bird.png
diff --git a/packages/kolibri/components/internal/ContentRenderer/ContentRendererError.vue b/packages/kolibri/components/internal/ContentRenderer/ContentRendererError.vue
index 1c09ec0db12..71c0590fc23 100644
--- a/packages/kolibri/components/internal/ContentRenderer/ContentRendererError.vue
+++ b/packages/kolibri/components/internal/ContentRenderer/ContentRendererError.vue
@@ -32,9 +32,9 @@
 
   import { crossComponentTranslator } from 'kolibri/utils/i18n';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
-  import AppError from 'kolibri-common/components/AppError';
-  import ReportErrorModal from 'kolibri-common/components/AppError/ReportErrorModal';
-  import DownloadButton from 'kolibri-common/components/DownloadButton';
+  import AppError from 'kolibri/components/error/AppError';
+  import ReportErrorModal from 'kolibri/components/error/ReportErrorModal';
+  import DownloadButton from 'kolibri/components/DownloadButton';
 
   export default {
     name: 'ContentRendererError',
diff --git a/packages/kolibri-common/utils/__tests__/contentViewer.spec.js b/packages/kolibri/components/internal/ContentRenderer/__tests__/contentViewer.spec.js
similarity index 96%
rename from packages/kolibri-common/utils/__tests__/contentViewer.spec.js
rename to packages/kolibri/components/internal/ContentRenderer/__tests__/contentViewer.spec.js
index eabb220aaf7..a73e9ccf0a0 100644
--- a/packages/kolibri-common/utils/__tests__/contentViewer.spec.js
+++ b/packages/kolibri/components/internal/ContentRenderer/__tests__/contentViewer.spec.js
@@ -1,11 +1,6 @@
 import Vue from 'vue';
 import { RENDERER_SUFFIX } from 'kolibri/constants';
-import {
-  canRenderContent,
-  getRenderableFiles,
-  getDefaultFile,
-  getFilePreset,
-} from '../contentViewer';
+import { canRenderContent, getRenderableFiles, getDefaultFile, getFilePreset } from '../utils';
 
 // Add a component to the Vue instance that can be used to test the utility functions
 const addRegisterableComponents = (...presets) => {
diff --git a/packages/kolibri/components/internal/ContentRenderer/index.js b/packages/kolibri/components/internal/ContentRenderer/index.js
index a325770d965..c67d4184a8b 100644
--- a/packages/kolibri/components/internal/ContentRenderer/index.js
+++ b/packages/kolibri/components/internal/ContentRenderer/index.js
@@ -1,10 +1,5 @@
 import { RENDERER_SUFFIX } from 'kolibri/constants';
-import {
-  canRenderContent,
-  getRenderableFiles,
-  getDefaultFile,
-  getFilePreset,
-} from 'kolibri-common/utils/contentViewer';
+import { canRenderContent, getRenderableFiles, getDefaultFile, getFilePreset } from './utils';
 import ContentRendererError from './ContentRendererError';
 
 export default {
diff --git a/packages/kolibri/components/internal/ContentRenderer/mixin.js b/packages/kolibri/components/internal/ContentRenderer/mixin.js
index 6759fbae241..4c6d65e008f 100644
--- a/packages/kolibri/components/internal/ContentRenderer/mixin.js
+++ b/packages/kolibri/components/internal/ContentRenderer/mixin.js
@@ -8,7 +8,7 @@ import {
   getContentLangDir,
   languageDirections,
 } from 'kolibri/utils/i18n';
-import { getRenderableFiles, getDefaultFile } from 'kolibri-common/utils/contentViewer';
+import { getRenderableFiles, getDefaultFile } from './utils';
 import ContentRendererError from './ContentRendererError';
 
 const logging = logger.getLogger(__filename);
diff --git a/packages/kolibri-common/utils/contentViewer.js b/packages/kolibri/components/internal/ContentRenderer/utils.js
similarity index 100%
rename from packages/kolibri-common/utils/contentViewer.js
rename to packages/kolibri/components/internal/ContentRenderer/utils.js
diff --git a/packages/kolibri-common/uiText/filePresetStrings.js b/packages/kolibri/components/internal/filePresetStrings.js
similarity index 100%
rename from packages/kolibri-common/uiText/filePresetStrings.js
rename to packages/kolibri/components/internal/filePresetStrings.js
diff --git a/packages/kolibri/components/pages/AppBarPage/index.vue b/packages/kolibri/components/pages/AppBarPage/index.vue
index 939340415ae..c762edce163 100644
--- a/packages/kolibri/components/pages/AppBarPage/index.vue
+++ b/packages/kolibri/components/pages/AppBarPage/index.vue
@@ -57,7 +57,7 @@
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import { isTouchDevice } from 'kolibri/utils/browserInfo';
-  import useUserSyncStatus from 'kolibri-common/composables/useUserSyncStatus';
+  import useUserSyncStatus from 'kolibri/composables/useUserSyncStatus';
   import useUser from 'kolibri/composables/useUser';
   import ScrollingHeader from '../ScrollingHeader';
   import AppBar from './internal/AppBar';
diff --git a/packages/kolibri/components/pages/AppBarPage/internal/SideNav.vue b/packages/kolibri/components/pages/AppBarPage/internal/SideNav.vue
index 61852937948..aac3431052e 100644
--- a/packages/kolibri/components/pages/AppBarPage/internal/SideNav.vue
+++ b/packages/kolibri/components/pages/AppBarPage/internal/SideNav.vue
@@ -254,17 +254,17 @@
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import { UserKinds, NavComponentSections } from 'kolibri/constants';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
-  import CoreMenu from 'kolibri-common/components/CoreMenu';
-  import CoreMenuOption from 'kolibri-common/components/CoreMenu/CoreMenuOption';
+  import CoreMenu from 'kolibri/components/CoreMenu';
+  import CoreMenuOption from 'kolibri/components/CoreMenu/CoreMenuOption';
   import CoreLogo from 'kolibri/components/CoreLogo';
-  import PrivacyInfoModal from 'kolibri-common/components/PrivacyInfoModal';
+  import PrivacyInfoModal from 'kolibri/components/PrivacyInfoModal';
   import themeConfig from 'kolibri/styles/themeConfig';
-  import Backdrop from 'kolibri-common/components/Backdrop';
+  import Backdrop from 'kolibri/components/Backdrop';
   import LanguageSwitcherModal from 'kolibri/components/language-switcher/LanguageSwitcherModal';
   import urls from 'kolibri/urls';
   import useNav from 'kolibri/composables/useNav';
   import useUser from 'kolibri/composables/useUser';
-  import useUserSyncStatus from 'kolibri-common/composables/useUserSyncStatus';
+  import useUserSyncStatus from 'kolibri/composables/useUserSyncStatus';
   import SyncStatusDisplay from '../../../SyncStatusDisplay';
   import LearnOnlyDeviceNotice from './LearnOnlyDeviceNotice';
   import TotalPoints from './TotalPoints';
diff --git a/packages/kolibri/components/pages/AppBarPage/internal/SideNavDivider.vue b/packages/kolibri/components/pages/AppBarPage/internal/SideNavDivider.vue
index 9c0c47ac076..d2ac417e898 100644
--- a/packages/kolibri/components/pages/AppBarPage/internal/SideNavDivider.vue
+++ b/packages/kolibri/components/pages/AppBarPage/internal/SideNavDivider.vue
@@ -1,22 +1,33 @@
 <template>
 
-  <CoreMenuDivider />
+  <li>
+    <span
+      class="divider"
+      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
+    >
+    </span>
+  </li>
 
 </template>
 
 
 <script>
 
-  import CoreMenuDivider from 'kolibri-common/components/CoreMenu/CoreMenuDivider';
-
   export default {
     name: 'SideNavDivider',
-    components: {
-      CoreMenuDivider,
-    },
   };
 
 </script>
 
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+  .divider {
+    display: block;
+    min-width: 100%;
+    height: 1px;
+    margin: 8px 0;
+    overflow-y: hidden;
+  }
+
+</style>
diff --git a/packages/kolibri/components/pages/NotificationsRoot/index.vue b/packages/kolibri/components/pages/NotificationsRoot/index.vue
index 19189f95ce6..e99d96d6297 100644
--- a/packages/kolibri/components/pages/NotificationsRoot/index.vue
+++ b/packages/kolibri/components/pages/NotificationsRoot/index.vue
@@ -44,15 +44,15 @@
 
   import { mapState } from 'vuex';
   import Lockr from 'lockr';
-  import PingbackNotificationResource from 'kolibri-common/apiResources/PingbackNotificationResource';
-  import PingbackNotificationDismissedResource from 'kolibri-common/apiResources/PingbackNotificationDismissedResource';
   import { UPDATE_MODAL_DISMISSED } from 'kolibri/constants';
   import { currentLanguage, defaultLanguage } from 'kolibri/utils/i18n';
   import AuthMessage from 'kolibri/components/AuthMessage';
   import AppBarPage from 'kolibri/components/pages/AppBarPage';
-  import AppError from 'kolibri-common/components/AppError';
-  import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
+  import AppError from 'kolibri/components/error/AppError';
+  import GlobalSnackbar from 'kolibri/components/GlobalSnackbar';
   import useUser from 'kolibri/composables/useUser';
+  import PingbackNotificationDismissedResource from './internal/PingbackNotificationDismissedResource';
+  import PingbackNotificationResource from './internal/PingbackNotificationResource';
   import UpdateNotification from './internal/UpdateNotification';
 
   export default {
diff --git a/packages/kolibri-common/apiResources/PingbackNotificationDismissedResource.js b/packages/kolibri/components/pages/NotificationsRoot/internal/PingbackNotificationDismissedResource.js
similarity index 100%
rename from packages/kolibri-common/apiResources/PingbackNotificationDismissedResource.js
rename to packages/kolibri/components/pages/NotificationsRoot/internal/PingbackNotificationDismissedResource.js
diff --git a/packages/kolibri-common/apiResources/PingbackNotificationResource.js b/packages/kolibri/components/pages/NotificationsRoot/internal/PingbackNotificationResource.js
similarity index 100%
rename from packages/kolibri-common/apiResources/PingbackNotificationResource.js
rename to packages/kolibri/components/pages/NotificationsRoot/internal/PingbackNotificationResource.js
diff --git a/packages/kolibri/components/pages/__tests__/NotificationsRoot.spec.js b/packages/kolibri/components/pages/__tests__/NotificationsRoot.spec.js
index e56b26a2c56..080c6d2e292 100644
--- a/packages/kolibri/components/pages/__tests__/NotificationsRoot.spec.js
+++ b/packages/kolibri/components/pages/__tests__/NotificationsRoot.spec.js
@@ -6,8 +6,8 @@ import { coreStoreFactory as makeStore } from '../../../store';
 import coreModule from '../../../../../kolibri/core/assets/src/state/modules/core';
 
 jest.mock('kolibri/composables/useUser');
-jest.mock('kolibri-common/apiResources/PingbackNotificationResource');
-jest.mock('kolibri-common/apiResources/PingbackNotificationDismissedResource');
+jest.mock('../NotificationsRoot/internal/PingbackNotificationResource');
+jest.mock('../NotificationsRoot/internal/PingbackNotificationDismissedResource');
 
 function makeWrapper(useUserMockObj = null) {
   const store = makeStore();
diff --git a/packages/kolibri-common/apiResources/UserProgressResource.js b/packages/kolibri/composables/internal/UserProgressResource.js
similarity index 100%
rename from packages/kolibri-common/apiResources/UserProgressResource.js
rename to packages/kolibri/composables/internal/UserProgressResource.js
diff --git a/packages/kolibri/composables/useTotalProgress.js b/packages/kolibri/composables/useTotalProgress.js
index dd15944068b..3fd3131b75b 100644
--- a/packages/kolibri/composables/useTotalProgress.js
+++ b/packages/kolibri/composables/useTotalProgress.js
@@ -1,8 +1,8 @@
 import { ref, computed } from '@vue/composition-api';
 import { get, set } from '@vueuse/core';
 import useUser from 'kolibri/composables/useUser';
-import UserProgressResource from 'kolibri-common/apiResources/UserProgressResource';
 import { MaxPointsPerContent } from 'kolibri/constants';
+import UserProgressResource from './internal/UserProgressResource';
 
 const totalProgress = ref(null);
 
diff --git a/packages/kolibri-common/composables/useUserSyncStatus.js b/packages/kolibri/composables/useUserSyncStatus.js
similarity index 95%
rename from packages/kolibri-common/composables/useUserSyncStatus.js
rename to packages/kolibri/composables/useUserSyncStatus.js
index 91f24b5c93d..6e2ed1f9de2 100644
--- a/packages/kolibri-common/composables/useUserSyncStatus.js
+++ b/packages/kolibri/composables/useUserSyncStatus.js
@@ -1,10 +1,14 @@
 import { ref, onMounted, onUnmounted, computed } from '@vue/composition-api';
-import UserSyncStatusResource from 'kolibri-common/apiResources/UserSyncStatusResource';
+import { Resource } from 'kolibri/apiResource';
 import store from 'kolibri/store';
 import { SyncStatus } from 'kolibri/constants';
 import { get, useTimeoutPoll } from '@vueuse/core';
 import useUser from 'kolibri/composables/useUser';
 
+const UserSyncStatusResource = new Resource({
+  name: 'usersyncstatus',
+});
+
 const { isLearnerOnlyImport, isUserLoggedIn, currentUserId } = useUser();
 
 const status = ref(SyncStatus.NOT_CONNECTED);
diff --git a/packages/kolibri/internal/apiSpec.js b/packages/kolibri/internal/apiSpec.js
index 8afaeba9634..9bf80b57fe3 100644
--- a/packages/kolibri/internal/apiSpec.js
+++ b/packages/kolibri/internal/apiSpec.js
@@ -9,12 +9,21 @@ export default {
   'kolibri/apiResources/TaskResource': require('kolibri/apiResources/TaskResource'),
   'kolibri/client': require('kolibri/client'),
   'kolibri/components/AuthMessage': require('kolibri/components/AuthMessage'),
+  'kolibri/components/Backdrop': require('kolibri/components/Backdrop'),
   'kolibri/components/BottomAppBar': require('kolibri/components/BottomAppBar'),
   'kolibri/components/CoreLogo': require('kolibri/components/CoreLogo'),
+  'kolibri/components/CoreMenu': require('kolibri/components/CoreMenu'),
+  'kolibri/components/CoreMenu/CoreMenuOption': require('kolibri/components/CoreMenu/CoreMenuOption'),
   'kolibri/components/CoreTable': require('kolibri/components/CoreTable'),
+  'kolibri/components/DownloadButton': require('kolibri/components/DownloadButton'),
   'kolibri/components/FilterTextbox': require('kolibri/components/FilterTextbox'),
+  'kolibri/components/GlobalSnackbar': require('kolibri/components/GlobalSnackbar'),
+  'kolibri/components/PrivacyInfoModal': require('kolibri/components/PrivacyInfoModal'),
   'kolibri/components/SkipNavigationLink': require('kolibri/components/SkipNavigationLink'),
   'kolibri/components/SyncStatusDisplay': require('kolibri/components/SyncStatusDisplay'),
+  'kolibri/components/error/AppError': require('kolibri/components/error/AppError'),
+  'kolibri/components/error/ReportErrorModal': require('kolibri/components/error/ReportErrorModal'),
+  'kolibri/components/error/TechnicalTextBlock': require('kolibri/components/error/TechnicalTextBlock'),
   'kolibri/components/language-switcher/LanguageSwitcherList': require('kolibri/components/language-switcher/LanguageSwitcherList'),
   'kolibri/components/language-switcher/LanguageSwitcherModal': require('kolibri/components/language-switcher/LanguageSwitcherModal'),
   'kolibri/components/pages/AppBarPage': require('kolibri/components/pages/AppBarPage'),
@@ -27,6 +36,7 @@ export default {
   'kolibri/composables/useSnackbar': require('kolibri/composables/useSnackbar'),
   'kolibri/composables/useTotalProgress': require('kolibri/composables/useTotalProgress'),
   'kolibri/composables/useUser': require('kolibri/composables/useUser'),
+  'kolibri/composables/useUserSyncStatus': require('kolibri/composables/useUserSyncStatus'),
   'kolibri/constants': require('kolibri/constants'),
   'kolibri/heartbeat': require('kolibri/heartbeat'),
   'kolibri/router': require('kolibri/router'),
@@ -44,6 +54,7 @@ export default {
   'kolibri/utils/i18n': require('kolibri/utils/i18n'),
   'kolibri/utils/objectSpecs': require('kolibri/utils/objectSpecs'),
   'kolibri/utils/redirectBrowser': require('kolibri/utils/redirectBrowser'),
+  'kolibri/utils/scriptLoader': require('kolibri/utils/scriptLoader'),
   'kolibri/utils/serverClock': require('kolibri/utils/serverClock'),
   'kolibri/utils/validators': require('kolibri/utils/validators'),
   'kolibri-logging': require('kolibri-logging'),
diff --git a/packages/kolibri/internal/pluginMediator.js b/packages/kolibri/internal/pluginMediator.js
index a5dd4b6dd96..c4303716515 100644
--- a/packages/kolibri/internal/pluginMediator.js
+++ b/packages/kolibri/internal/pluginMediator.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import logging from 'kolibri-logging';
-import scriptLoader from 'kolibri-common/utils/scriptLoader';
+import scriptLoader from 'kolibri/utils/scriptLoader';
 import { RENDERER_SUFFIX } from 'kolibri/constants';
 import { languageDirection, languageDirections, currentLanguage } from 'kolibri/utils/i18n';
 import contentRendererMixin from '../components/internal/ContentRenderer/mixin';
diff --git a/packages/kolibri/package.json b/packages/kolibri/package.json
index 2140684a9b2..04b9f656051 100644
--- a/packages/kolibri/package.json
+++ b/packages/kolibri/package.json
@@ -12,12 +12,21 @@
     "./apiResources/TaskResource": "./apiResources/TaskResource",
     "./client": "./client",
     "./components/AuthMessage": "./components/AuthMessage",
+    "./components/Backdrop": "./components/Backdrop",
     "./components/BottomAppBar": "./components/BottomAppBar",
     "./components/CoreLogo": "./components/CoreLogo",
+    "./components/CoreMenu": "./components/CoreMenu",
+    "./components/CoreMenu/CoreMenuOption": "./components/CoreMenu/CoreMenuOption",
     "./components/CoreTable": "./components/CoreTable",
+    "./components/DownloadButton": "./components/DownloadButton",
     "./components/FilterTextbox": "./components/FilterTextbox",
+    "./components/GlobalSnackbar": "./components/GlobalSnackbar",
+    "./components/PrivacyInfoModal": "./components/PrivacyInfoModal",
     "./components/SkipNavigationLink": "./components/SkipNavigationLink",
     "./components/SyncStatusDisplay": "./components/SyncStatusDisplay",
+    "./components/error/AppError": "./components/error/AppError",
+    "./components/error/ReportErrorModal": "./components/error/ReportErrorModal",
+    "./components/error/TechnicalTextBlock": "./components/error/TechnicalTextBlock",
     "./components/language-switcher/LanguageSwitcherList": "./components/language-switcher/LanguageSwitcherList",
     "./components/language-switcher/LanguageSwitcherModal": "./components/language-switcher/LanguageSwitcherModal",
     "./components/pages/AppBarPage": "./components/pages/AppBarPage",
@@ -30,6 +39,7 @@
     "./composables/useSnackbar": "./composables/useSnackbar",
     "./composables/useTotalProgress": "./composables/useTotalProgress",
     "./composables/useUser": "./composables/useUser",
+    "./composables/useUserSyncStatus": "./composables/useUserSyncStatus",
     "./constants": "./constants",
     "./heartbeat": "./heartbeat",
     "./router": "./router",
@@ -47,6 +57,7 @@
     "./utils/i18n": "./utils/i18n",
     "./utils/objectSpecs": "./utils/objectSpecs",
     "./utils/redirectBrowser": "./utils/redirectBrowser",
+    "./utils/scriptLoader": "./utils/scriptLoader",
     "./utils/serverClock": "./utils/serverClock",
     "./utils/validators": "./utils/validators"
   },
diff --git a/packages/kolibri-common/utils/scriptLoader.js b/packages/kolibri/utils/scriptLoader.js
similarity index 100%
rename from packages/kolibri-common/utils/scriptLoader.js
rename to packages/kolibri/utils/scriptLoader.js