diff --git a/app/coffeescripts/calendar/CalendarEvent.js b/app/coffeescripts/calendar/CalendarEvent.js
index cfdf37ea323..205f9c92d8f 100644
--- a/app/coffeescripts/calendar/CalendarEvent.js
+++ b/app/coffeescripts/calendar/CalendarEvent.js
@@ -17,7 +17,7 @@
 
 import React from 'react'
 import ReactDOM from 'react-dom'
-import Spinner from '@instructure/ui-core/lib/components/Spinner'
+import Spinner from '@instructure/ui-elements/lib/components/Spinner'
 import $ from 'jquery'
 import _ from 'underscore'
 import Backbone from 'Backbone'
diff --git a/app/jsx/calendar/scheduler/components/appointment_groups/AppointmentGroupList.js b/app/jsx/calendar/scheduler/components/appointment_groups/AppointmentGroupList.js
index 983fc27b989..7897e8c67fc 100644
--- a/app/jsx/calendar/scheduler/components/appointment_groups/AppointmentGroupList.js
+++ b/app/jsx/calendar/scheduler/components/appointment_groups/AppointmentGroupList.js
@@ -21,9 +21,9 @@ import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import I18n from 'i18n!appointment_groups'
 import natcompare from 'compiled/util/natcompare'
-import Grid, { GridRow, GridCol } from '@instructure/ui-core/lib/components/Grid'
-import Text from '@instructure/ui-core/lib/components/Text'
-import Pill from '@instructure/ui-core/lib/components/Pill'
+import Grid, { GridRow, GridCol } from '@instructure/ui-layout/lib/components/Grid'
+import Text from '@instructure/ui-elements/lib/components/Text'
+import Pill from '@instructure/ui-elements/lib/components/Pill'
 import IconCalendarAddLine from '@instructure/ui-icons/lib/Line/IconCalendarAdd'
 import IconCalendarReservedLine from '@instructure/ui-icons/lib/Line/IconCalendarReserved'
 import $ from 'jquery'
diff --git a/app/jsx/calendar/scheduler/components/appointment_groups/ContextSelector.js b/app/jsx/calendar/scheduler/components/appointment_groups/ContextSelector.js
index 46ffc46d7ae..dfd32b1af5c 100644
--- a/app/jsx/calendar/scheduler/components/appointment_groups/ContextSelector.js
+++ b/app/jsx/calendar/scheduler/components/appointment_groups/ContextSelector.js
@@ -19,10 +19,10 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import I18n from 'i18n!appointment_groups'
-import Button from '@instructure/ui-core/lib/components/Button'
+import Button from '@instructure/ui-buttons/lib/components/Button'
 import IconMiniArrowRight from '@instructure/ui-icons/lib/Solid/IconMiniArrowRight'
 import IconMiniArrowDown from '@instructure/ui-icons/lib/Solid/IconMiniArrowDown'
-import Grid, { GridCol, GridRow } from '@instructure/ui-core/lib/components/Grid'
+import Grid, { GridCol, GridRow } from '@instructure/ui-layout/lib/components/Grid'
 
   class ContextSelector extends React.Component {
     static propTypes = {
diff --git a/app/jsx/calendar/scheduler/components/appointment_groups/EditPage.js b/app/jsx/calendar/scheduler/components/appointment_groups/EditPage.js
index 4a646e3cf31..6f0852b6a7c 100644
--- a/app/jsx/calendar/scheduler/components/appointment_groups/EditPage.js
+++ b/app/jsx/calendar/scheduler/components/appointment_groups/EditPage.js
@@ -20,14 +20,14 @@ import $ from 'jquery'
 import React from 'react'
 import PropTypes from 'prop-types'
 import I18n from 'i18n!appointment_groups'
-import Breadcrumb, { BreadcrumbLink } from '@instructure/ui-core/lib/components/Breadcrumb'
-import Button from '@instructure/ui-core/lib/components/Button'
-import Grid, { GridCol, GridRow } from '@instructure/ui-core/lib/components/Grid'
-import FormFieldGroup from '@instructure/ui-core/lib/components/FormFieldGroup'
-import ScreenReaderContent from '@instructure/ui-core/lib/components/ScreenReaderContent'
-import TextArea from '@instructure/ui-core/lib/components/TextArea'
-import TextInput from '@instructure/ui-core/lib/components/TextInput'
-import Checkbox from '@instructure/ui-core/lib/components/Checkbox'
+import Breadcrumb, { BreadcrumbLink } from '@instructure/ui-breadcrumb/lib/components/Breadcrumb'
+import Button from '@instructure/ui-buttons/lib/components/Button'
+import Grid, { GridCol, GridRow } from '@instructure/ui-layout/lib/components/Grid'
+import FormFieldGroup from '@instructure/ui-forms/lib/components/FormFieldGroup'
+import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
+import TextArea from '@instructure/ui-forms/lib/components/TextArea'
+import TextInput from '@instructure/ui-forms/lib/components/TextInput'
+import Checkbox from '@instructure/ui-forms/lib/components/Checkbox'
 import 'compiled/jquery.rails_flash_notifications'
 import 'jquery.instructure_forms'
 import 'jquery.instructure_date_and_time'
diff --git a/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelectRow.js b/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelectRow.js
index 69e93a13a69..f727d0cadb8 100644
--- a/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelectRow.js
+++ b/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelectRow.js
@@ -20,8 +20,8 @@ import $ from 'jquery'
 import React from 'react'
 import PropTypes from 'prop-types'
 import I18n from 'i18n!appointment_groups'
-import Button from '@instructure/ui-core/lib/components/Button'
-import Text from '@instructure/ui-core/lib/components/Text'
+import Button from '@instructure/ui-buttons/lib/components/Button'
+import Text from '@instructure/ui-elements/lib/components/Text'
 import IconXSolid from '@instructure/ui-icons/lib/Solid/IconX'
 import coupleTimeFields from 'compiled/util/coupleTimeFields'
 import 'jquery.instructure_date_and_time'
diff --git a/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelector.js b/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelector.js
index 3ef1a59996a..da9ad67577f 100644
--- a/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelector.js
+++ b/app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelector.js
@@ -23,10 +23,10 @@ import PropTypes from 'prop-types'
 import I18n from 'i18n!appointment_groups'
 import TimeBlockListManager from 'compiled/calendar/TimeBlockListManager'
 import 'jquery.instructure_date_and_time'
-import FormFieldGroup from '@instructure/ui-core/lib/components/FormFieldGroup'
-import NumberInput from '@instructure/ui-core/lib/components/NumberInput'
-import ScreenReaderContent from '@instructure/ui-core/lib/components/ScreenReaderContent'
-import Button from '@instructure/ui-core/lib/components/Button'
+import FormFieldGroup from '@instructure/ui-forms/lib/components/FormFieldGroup'
+import NumberInput from '@instructure/ui-forms/lib/components/NumberInput'
+import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
+import Button from '@instructure/ui-buttons/lib/components/Button'
 import TimeBlockSelectRow from './TimeBlockSelectRow'
 
 const uniqueId = (() => {