diff --git a/src/controls/accordion/Accordion.tsx b/src/controls/accordion/Accordion.tsx
index b682c841f..f4aa14d18 100644
--- a/src/controls/accordion/Accordion.tsx
+++ b/src/controls/accordion/Accordion.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import styles from './Accordion.module.scss';
 import { IAccordionProps, IAccordionState } from './index';
 import { css } from "@uifabric/utilities/lib/css";
-import { DefaultButton } from '@fluentui/react/lib/components/Button';
+import { DefaultButton } from '@fluentui/react/lib/Button';
 import { IIconProps } from '@fluentui/react/lib/Icon';
 import * as telemetry from '../../common/telemetry';
 
diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
index 3105fe554..fa1d162d2 100644
--- a/src/controls/dynamicForm/DynamicForm.tsx
+++ b/src/controls/dynamicForm/DynamicForm.tsx
@@ -17,7 +17,6 @@ import { IDropdownOption } from "@fluentui/react/lib/Dropdown";
 import { MessageBar, MessageBarType } from "@fluentui/react/lib/MessageBar";
 import { ProgressIndicator } from "@fluentui/react/lib/ProgressIndicator";
 import { IStackTokens, Stack } from "@fluentui/react/lib/Stack";
-import { Icon } from "@fluentui/react/lib/components/Icon/Icon";
 import { DynamicField } from "./dynamicField";
 import {
   DateFormat,
@@ -45,6 +44,7 @@ import CustomFormattingHelper from "../../common/utilities/CustomFormatting";
 // Dynamic Form Props / State
 import { IDynamicFormProps } from "./IDynamicFormProps";
 import { IDynamicFormState } from "./IDynamicFormState";
+import { Icon } from "@fluentui/react/lib/Icon";
 
 const stackTokens: IStackTokens = { childrenGap: 20 };
 
diff --git a/src/controls/dynamicForm/dynamicField/DynamicField.tsx b/src/controls/dynamicForm/dynamicField/DynamicField.tsx
index 777535718..36518c544 100644
--- a/src/controls/dynamicForm/dynamicField/DynamicField.tsx
+++ b/src/controls/dynamicForm/dynamicField/DynamicField.tsx
@@ -3,7 +3,7 @@ import { sp } from '@pnp/sp/presets/all';
 import '@pnp/sp/webs';
 import * as strings from 'ControlStrings';
 import { ActionButton } from '@fluentui/react/lib/Button';
-import { Dropdown, IDropdownOption, IDropdownProps } from '@fluentui/react/lib/components/Dropdown';
+import { Dropdown, IDropdownOption, IDropdownProps } from '@fluentui/react/lib/Dropdown';
 import { DatePicker } from '@fluentui/react/lib/DatePicker';
 import { Icon } from '@fluentui/react/lib/Icon';
 import { Image } from '@fluentui/react/lib/Image';
diff --git a/src/controls/fieldCollectionData/FieldCollectionData.tsx b/src/controls/fieldCollectionData/FieldCollectionData.tsx
index 6201d5f1d..ac0e8f2d4 100644
--- a/src/controls/fieldCollectionData/FieldCollectionData.tsx
+++ b/src/controls/fieldCollectionData/FieldCollectionData.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as telemetry from '../../common/telemetry';
-import { DefaultButton } from '@fluentui/react/lib/components/Button';
-import { Panel, PanelType } from '@fluentui/react/lib/components/Panel';
-import { Label } from '@fluentui/react/lib/components/Label';
+import { DefaultButton } from '@fluentui/react/lib/Button';
+import { Panel, PanelType } from '@fluentui/react/lib/Panel';
+import { Label } from '@fluentui/react/lib/Label';
 import { CollectionDataViewer } from './collectionDataViewer';
 import { IFieldCollectionDataProps, IFieldCollectionDataState } from "./IFieldCollectionData";
 import * as strings from 'ControlStrings';
diff --git a/src/controls/fieldCollectionData/collectionDataItem/CollectionDataItem.tsx b/src/controls/fieldCollectionData/collectionDataItem/CollectionDataItem.tsx
index 6fb55a15a..07823ba9f 100644
--- a/src/controls/fieldCollectionData/collectionDataItem/CollectionDataItem.tsx
+++ b/src/controls/fieldCollectionData/collectionDataItem/CollectionDataItem.tsx
@@ -2,16 +2,16 @@ import * as React from 'react';
 import styles from '../FieldCollectionData.module.scss';
 import { ICollectionDataItemProps } from './ICollectionDataItemProps';
 import { ICollectionDataItemState } from './ICollectionDataItemState';
-import { TextField } from '@fluentui/react/lib/components/TextField';
-import { Icon } from '@fluentui/react/lib/components/Icon';
-import { Link } from '@fluentui/react/lib/components/Link';
-import { Checkbox } from '@fluentui/react/lib/components/Checkbox';
+import { TextField } from '@fluentui/react/lib/TextField';
+import { Icon } from '@fluentui/react/lib/Icon';
+import { Link } from '@fluentui/react/lib/Link';
+import { Checkbox } from '@fluentui/react/lib/Checkbox';
 import * as strings from 'ControlStrings';
 import { CustomCollectionFieldType, ICustomCollectionField } from '../ICustomCollectionField';
-import { Dropdown, IDropdownOption } from '@fluentui/react/lib/components/Dropdown';
-import { ComboBox, IComboBoxOption } from '@fluentui/react/lib/components/ComboBox';
+import { Dropdown, IDropdownOption } from '@fluentui/react/lib/Dropdown';
+import { ComboBox, IComboBoxOption } from '@fluentui/react/lib/ComboBox';
 import { IPeoplePickerContext, PeoplePicker, PrincipalType } from "../../peoplepicker";
-import { Callout, DirectionalHint } from '@fluentui/react/lib/components/Callout';
+import { Callout, DirectionalHint } from '@fluentui/react/lib/Callout';
 import { CollectionIconField } from '../collectionIconField';
 import { clone, findIndex, sortBy } from '@microsoft/sp-lodash-subset';
 import { Guid } from '@microsoft/sp-core-library';
diff --git a/src/controls/fieldCollectionData/collectionDataViewer/CollectionDataViewer.tsx b/src/controls/fieldCollectionData/collectionDataViewer/CollectionDataViewer.tsx
index 0ef19e40e..764b31921 100644
--- a/src/controls/fieldCollectionData/collectionDataViewer/CollectionDataViewer.tsx
+++ b/src/controls/fieldCollectionData/collectionDataViewer/CollectionDataViewer.tsx
@@ -3,12 +3,12 @@ import styles from '../FieldCollectionData.module.scss';
 import { ICollectionDataViewerProps } from './ICollectionDataViewerProps';
 import { ICollectionDataViewerState } from './ICollectionDataViewerState';
 import { CollectionDataItem } from '../collectionDataItem';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
-import { Icon } from '@fluentui/react/lib/components/Icon';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
+import { Icon } from '@fluentui/react/lib/Icon';
 import * as strings from 'ControlStrings';
 import { cloneDeep, sortBy, isEmpty, findIndex } from '@microsoft/sp-lodash-subset';
 import { Pagination } from '../../pagination';
-import { SearchBox } from '@fluentui/react/lib/components/SearchBox';
+import { SearchBox } from '@fluentui/react/lib/SearchBox';
 import { Guid } from '@microsoft/sp-core-library';
 
 export class CollectionDataViewer extends React.Component<ICollectionDataViewerProps, ICollectionDataViewerState> {
diff --git a/src/controls/fieldCollectionData/collectionIconField/CollectionIconField.tsx b/src/controls/fieldCollectionData/collectionIconField/CollectionIconField.tsx
index b8db38ad9..ab67b85d0 100644
--- a/src/controls/fieldCollectionData/collectionIconField/CollectionIconField.tsx
+++ b/src/controls/fieldCollectionData/collectionIconField/CollectionIconField.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import styles from '../FieldCollectionData.module.scss';
 import { ICollectionIconFieldProps } from '.';
-import { TextField } from '@fluentui/react/lib/components/TextField';
-import { Icon } from '@fluentui/react/lib/components/Icon';
+import { TextField } from '@fluentui/react/lib/TextField';
+import { Icon } from '@fluentui/react/lib/Icon';
 
 export class CollectionIconField extends React.Component<ICollectionIconFieldProps, {}> {
 
diff --git a/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx b/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx
index 02902995d..692e1fd6e 100644
--- a/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx
+++ b/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { css } from '@fluentui/react/lib/Utilities';
 import clone from 'lodash/clone';
 import { IExpandingCardProps } from '@fluentui/react/lib/HoverCard';
-import { DirectionalHint } from '@fluentui/react/lib/common/DirectionalHint';
+import { DirectionalHint } from '@fluentui/react/lib/Callout';
 import { Persona, PersonaSize } from '@fluentui/react/lib/Persona';
 import { IconButton, Button, ButtonType } from '@fluentui/react/lib/Button';
 import { Spinner, SpinnerSize } from '@fluentui/react/lib/Spinner';
diff --git a/src/controls/filePicker/FilePicker.tsx b/src/controls/filePicker/FilePicker.tsx
index 3983116eb..32b78215e 100644
--- a/src/controls/filePicker/FilePicker.tsx
+++ b/src/controls/filePicker/FilePicker.tsx
@@ -5,12 +5,13 @@ import { IIconProps } from "@fluentui/react/lib/Icon";
 import {
   ActionButton,
   PrimaryButton
-} from "@fluentui/react/lib/components/Button";
-import { Label } from "@fluentui/react/lib/components/Label";
+} from "@fluentui/react/lib/Button";
+
+import { Label } from "@fluentui/react/lib/Label";
 import {
   Panel,
   PanelType
-} from "@fluentui/react/lib/components/Panel";
+} from "@fluentui/react/lib/Panel";
 import {
   INavLink,
   INavLinkGroup,
diff --git a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx
index 505db4609..d037cb8ed 100644
--- a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx
+++ b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx
@@ -4,7 +4,7 @@ import { ILinkFilePickerTabProps } from './ILinkFilePickerTabProps';
 import { ILinkFilePickerTabState } from './ILinkFilePickerTabState';
 import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
 import { IFilePickerResult } from '../FilePicker.types';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { TextField } from '@fluentui/react/lib/TextField';
 import { css } from '@fluentui/react/lib/Utilities';
 
diff --git a/src/controls/filePicker/MultipleUploadFilePickerTab/MultipleUploadFilePickerTab.tsx b/src/controls/filePicker/MultipleUploadFilePickerTab/MultipleUploadFilePickerTab.tsx
index 5a9b118cb..3d3d798fa 100644
--- a/src/controls/filePicker/MultipleUploadFilePickerTab/MultipleUploadFilePickerTab.tsx
+++ b/src/controls/filePicker/MultipleUploadFilePickerTab/MultipleUploadFilePickerTab.tsx
@@ -4,7 +4,7 @@ import { IMultipleUploadFilePickerTabProps } from './IMultipleUploadFilePickerTa
 import { IMultipleUploadFilePickerTabState } from './IMultipleUploadFilePickerTabState';
 import { IFilePickerResult } from '../FilePicker.types';
 import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { css } from '@fluentui/react/lib/Utilities';
 import { DragDropFiles } from '../../dragDropFiles/DragDropFiles';
 
diff --git a/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.types.ts b/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.types.ts
index 3916f9429..46be3ca19 100644
--- a/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.types.ts
+++ b/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.types.ts
@@ -1,4 +1,4 @@
-import { IBreadcrumbItem } from "@fluentui/react/lib/components/Breadcrumb";
+import { IBreadcrumbItem } from "@fluentui/react/lib/Breadcrumb";
 import { IFile } from "../../../services/FileBrowserService.types";
 
 export interface OneDriveFilesBreadcrumbItem extends IBreadcrumbItem {
diff --git a/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx b/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx
index 4de53ebbb..368e9429e 100644
--- a/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx
+++ b/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { Spinner } from '@fluentui/react/lib/Spinner';
 import { FocusZone } from '@fluentui/react/lib/FocusZone';
 import { List } from '@fluentui/react/lib/List';
diff --git a/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx b/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx
index 818d6ea4b..03bb03897 100644
--- a/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx
+++ b/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx
@@ -4,7 +4,7 @@ import { ISiteFilePickerTabProps } from './ISiteFilePickerTabProps';
 import { ISiteFilePickerTabState } from './ISiteFilePickerTabState';
 import { DocumentLibraryBrowser } from '../controls/DocumentLibraryBrowser/DocumentLibraryBrowser';
 import { FileBrowser } from '../controls/FileBrowser/FileBrowser';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { ScrollablePane } from '@fluentui/react/lib/ScrollablePane';
 import { Breadcrumb } from '@fluentui/react/lib/Breadcrumb';
 import { IFile, IFolder, ILibrary } from '../../../services/FileBrowserService.types';
diff --git a/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx b/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx
index bdbfbb4c7..8ac8ed851 100644
--- a/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx
+++ b/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx
@@ -4,7 +4,7 @@ import { IUploadFilePickerTabProps } from './IUploadFilePickerTabProps';
 import { IUploadFilePickerTabState } from './IUploadFilePickerTabState';
 import { IFilePickerResult } from '../FilePicker.types';
 import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { css } from '@fluentui/react/lib/Utilities';
 
 import * as strings from 'ControlStrings';
diff --git a/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx b/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx
index 3afd94a04..845f4be71 100644
--- a/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx
+++ b/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { IWebSearchTabProps } from './IWebSearchTabProps';
 import { IWebSearchTabState } from './IWebSearchTabState';
 import { ISearchSuggestion, ImageSize, ImageAspect, ImageLicense, DEFAULT_SUGGESTIONS, MAX_ROW_HEIGHT, ROWS_PER_PAGE } from './WebSearchTab.types';
-import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/components/Button';
+import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
 import { Label } from '@fluentui/react/lib/Label';
 import { SearchBox } from '@fluentui/react/lib/SearchBox';
 import { Check } from '@fluentui/react/lib/Check';
diff --git a/src/controls/fileTypeIcon/FileTypeIcon.tsx b/src/controls/fileTypeIcon/FileTypeIcon.tsx
index 2e7f8cede..d9467a1ea 100644
--- a/src/controls/fileTypeIcon/FileTypeIcon.tsx
+++ b/src/controls/fileTypeIcon/FileTypeIcon.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { findIndex } from '@microsoft/sp-lodash-subset';
 import { IFileTypeIconProps, ApplicationType, ApplicationIconList, IconType, IconSizes, ImageSize, IImageResult, ICON_GENERIC_16, ICON_GENERIC_48, ICON_GENERIC_96, ImageInformation } from './IFileTypeIcon';
 import * as telemetry from '../../common/telemetry';
-import { Icon } from '@fluentui/react/lib/components/Icon';
+import { Icon } from '@fluentui/react/lib/Icon';
 import { ICON_GENERIC_20 } from '.';
 
 const ICON_GENERIC = 'Page';
diff --git a/src/controls/listItemComments/components/ConfirmDelete/ConfirmDelete.tsx b/src/controls/listItemComments/components/ConfirmDelete/ConfirmDelete.tsx
index b828481be..bc09f7993 100644
--- a/src/controls/listItemComments/components/ConfirmDelete/ConfirmDelete.tsx
+++ b/src/controls/listItemComments/components/ConfirmDelete/ConfirmDelete.tsx
@@ -4,7 +4,7 @@ import { ListItemCommentsStateContext } from "../ListItemCommentsStateProvider";
 import { Dialog, DialogType, DialogFooter } from "@fluentui/react/lib/Dialog";
 import { PrimaryButton, DefaultButton } from "@fluentui/react/lib/Button";
 import { CommentItem } from "../Comments/CommentItem";
-import { DocumentCard } from "@fluentui/react/lib/components/DocumentCard";
+import { DocumentCard } from "@fluentui/react/lib/DocumentCard";
 import { DocumentCardDetails } from "@fluentui/react/lib/DocumentCard";
 import { Stack } from "@fluentui/react/lib/Stack";
 import { useListItemCommentsStyles } from "../Comments/useListItemCommentsStyles";
diff --git a/src/controls/listItemPicker/IComboBoxListItemPickerProps.ts b/src/controls/listItemPicker/IComboBoxListItemPickerProps.ts
index 9e74e708f..30ee514a1 100644
--- a/src/controls/listItemPicker/IComboBoxListItemPickerProps.ts
+++ b/src/controls/listItemPicker/IComboBoxListItemPickerProps.ts
@@ -1,7 +1,7 @@
-import { IComboBoxOptionStyles, IComboBoxStyles } from "@fluentui/react/lib/components/ComboBox";
+import { IComboBoxOptionStyles, IComboBoxStyles } from "@fluentui/react/lib/ComboBox";
 
-import { IAutofillProps } from "@fluentui/react/lib/components/Autofill";
-import { IKeytipProps } from "@fluentui/react/lib/components/Keytip";
+import { IAutofillProps } from "@fluentui/react/lib/Autofill";
+import { IKeytipProps } from "@fluentui/react/lib/Keytip";
 import { SPHttpClient } from '@microsoft/sp-http';
 
 export interface IComboBoxListItemPickerProps {
diff --git a/src/controls/listItemPicker/ListItemPicker.tsx b/src/controls/listItemPicker/ListItemPicker.tsx
index 928bbcdb9..d4c982976 100644
--- a/src/controls/listItemPicker/ListItemPicker.tsx
+++ b/src/controls/listItemPicker/ListItemPicker.tsx
@@ -1,14 +1,13 @@
 import * as strings from 'ControlStrings';
 import * as React from "react";
 import SPservice from "../../services/SPService";
-import { TagPicker } from "@fluentui/react/lib/components/pickers/TagPicker/TagPicker";
+import { ITag, TagPicker } from '@fluentui/react/lib/Pickers';
 import { Label } from "@fluentui/react/lib/Label";
 import { getId } from '@fluentui/react/lib/Utilities';
 import { IListItemPickerProps } from "./IListItemPickerProps";
 import { IListItemPickerState } from "./IListItemPickerState";
 import * as telemetry from '../../common/telemetry';
 import isEqual from 'lodash/isEqual';
-import { ITag } from '@fluentui/react/lib/components/pickers/TagPicker/TagPicker.types';
 import { SPHelper } from '../../common/utilities/SPHelper';
 import { Guid } from "@microsoft/sp-core-library"
 
diff --git a/src/controls/listPicker/ListPicker.tsx b/src/controls/listPicker/ListPicker.tsx
index 38d273803..5cb6ef0af 100644
--- a/src/controls/listPicker/ListPicker.tsx
+++ b/src/controls/listPicker/ListPicker.tsx
@@ -1,6 +1,6 @@
 import { cloneDeep } from '@microsoft/sp-lodash-subset';
-import { Dropdown, IDropdownOption, IDropdownProps } from '@fluentui/react/lib/components/Dropdown';
-import { Spinner, SpinnerSize } from '@fluentui/react/lib/components/Spinner';
+import { Dropdown, IDropdownOption, IDropdownProps } from '@fluentui/react/lib/Dropdown';
+import { Spinner, SpinnerSize } from '@fluentui/react/lib/Spinner';
 import * as React from 'react';
 
 import * as telemetry from '../../common/telemetry';
diff --git a/src/controls/listView/IListView.ts b/src/controls/listView/IListView.ts
index 6fed62c20..cd5b1fbd1 100644
--- a/src/controls/listView/IListView.ts
+++ b/src/controls/listView/IListView.ts
@@ -1,4 +1,4 @@
-import { IColumn, IGroup, SelectionMode, IDetailsRowProps } from '@fluentui/react/lib/components/DetailsList';
+import { IColumn, IGroup, SelectionMode, IDetailsRowProps } from '@fluentui/react/lib/DetailsList';
 
 export { SelectionMode };
 
diff --git a/src/controls/listView/ListView.tsx b/src/controls/listView/ListView.tsx
index 80c5067c0..de3189935 100644
--- a/src/controls/listView/ListView.tsx
+++ b/src/controls/listView/ListView.tsx
@@ -6,7 +6,7 @@ import { IRenderFunction } from '@fluentui/react/lib/Utilities';
 import { mergeStyleSets } from '@fluentui/react/lib/Styling';
 import { DetailsList, DetailsListLayoutMode, Selection, SelectionMode, IGroup, IDetailsHeaderProps } from '@fluentui/react/lib/DetailsList';
 import { IListViewProps, IListViewState, IViewField, IGrouping, GroupOrder } from './IListView';
-import { IColumn, IGroupRenderProps } from '@fluentui/react/lib/components/DetailsList';
+import { IColumn, IGroupRenderProps } from '@fluentui/react/lib/DetailsList';
 import { findIndex, has, sortBy, isEqual, cloneDeep } from '@microsoft/sp-lodash-subset';
 import { FileTypeIcon, IconType } from '../fileTypeIcon/index';
 import * as strings from 'ControlStrings';
diff --git a/src/controls/map/Map.tsx b/src/controls/map/Map.tsx
index 8449e64c7..531f7e8c7 100644
--- a/src/controls/map/Map.tsx
+++ b/src/controls/map/Map.tsx
@@ -4,11 +4,11 @@ import styles from './Maps.module.scss';
 import { IMapProps } from './IMapProps';
 import { IMapState } from './IMapState';
 import { ICoordinates, MapType, LocationInfo } from './IMap';
-import { Label } from '@fluentui/react/lib/components/Label';
+import { Label } from '@fluentui/react/lib/Label';
 import { Spinner, SpinnerSize } from '@fluentui/react/lib/Spinner';
-import { Icon } from "@fluentui/react/lib/components/Icon";
-import { PrimaryButton } from "@fluentui/react/lib/components/Button";
-import { TextField } from "@fluentui/react/lib/components/TextField";
+import { Icon } from "@fluentui/react/lib/Icon";
+import { PrimaryButton } from "@fluentui/react/lib/Button";
+import { TextField } from "@fluentui/react/lib/TextField";
 import * as telemetry from '../../common/telemetry';
 import { isEqual } from "@microsoft/sp-lodash-subset";
 
diff --git a/src/controls/modernTaxonomyPicker/ModernTaxonomyPicker.tsx b/src/controls/modernTaxonomyPicker/ModernTaxonomyPicker.tsx
index 08649ecc2..5567b78d7 100644
--- a/src/controls/modernTaxonomyPicker/ModernTaxonomyPicker.tsx
+++ b/src/controls/modernTaxonomyPicker/ModernTaxonomyPicker.tsx
@@ -11,7 +11,7 @@ import * as strings from 'ControlStrings';
 import {
   DefaultButton, IButtonStyles, IconButton, PrimaryButton
 } from '@fluentui/react/lib/Button';
-import { IIconProps } from '@fluentui/react/lib/components/Icon';
+import { IIconProps } from '@fluentui/react/lib/Icon';
 import { Label } from '@fluentui/react/lib/Label';
 import {
   Panel,
diff --git a/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.tsx b/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.tsx
index f133b35f7..152c41207 100644
--- a/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.tsx
+++ b/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.tsx
@@ -1,19 +1,17 @@
 import React from 'react';
-import { BasePicker } from '@fluentui/react/lib/components/pickers/BasePicker';
 import { IModernTermPickerProps,
          ITermItemProps
        } from './ModernTermPicker.types';
 import { TermItem } from '../termItem/TermItem';
 import { TermItemSuggestion } from '../termItem/TermItemSuggestion';
-import { IBasePickerStyleProps,
-         IBasePickerStyles
-       } from '@fluentui/react/lib/components/pickers/BasePicker.types';
-import { getStyles } from '@fluentui/react/lib/components/pickers/BasePicker.styles';
+
 import { initializeComponentRef,
          styled
        } from '@fluentui/react/lib/Utilities';
-import { ISuggestionItemProps } from '@fluentui/react/lib/components/pickers/Suggestions/SuggestionsItem.types';
+
 import { ITermInfo } from '@pnp/sp/taxonomy';
+import { BasePicker, IBasePickerStyleProps, IBasePickerStyles, ISuggestionItemProps } from '@fluentui/react/lib/Pickers';
+import { getStyles } from '@fluentui/react/lib/components/pickers/BasePicker.styles';
 
 export class ModernTermPickerBase extends BasePicker<ITermInfo, IModernTermPickerProps> {
   public static defaultProps = {
diff --git a/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.types.ts b/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.types.ts
index 7bcbb1111..65f8b41c6 100644
--- a/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.types.ts
+++ b/src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.types.ts
@@ -1,9 +1,8 @@
 import { ITermInfo, ITermStoreInfo } from '@pnp/sp/taxonomy';
-import { IBasePickerProps } from '@fluentui/react/lib/components/pickers/BasePicker.types';
-import { IPickerItemProps } from '@fluentui/react/lib/components/pickers/PickerItem.types';
 import { IStyle, ITheme } from '@fluentui/react/lib/Styling';
 import { IStyleFunctionOrObject } from '@fluentui/react/lib/Utilities';
 import { IReadonlyTheme } from '@microsoft/sp-component-base';
+import { IBasePickerProps, IPickerItemProps } from '@fluentui/react/lib/Pickers';
 
 export interface IModernTermPickerProps extends IBasePickerProps<ITermInfo> {
   themeVariant?: IReadonlyTheme;
diff --git a/src/controls/modernTaxonomyPicker/termItem/TermItem.styles.ts b/src/controls/modernTaxonomyPicker/termItem/TermItem.styles.ts
index eddd099d8..a5e9b6af0 100644
--- a/src/controls/modernTaxonomyPicker/termItem/TermItem.styles.ts
+++ b/src/controls/modernTaxonomyPicker/termItem/TermItem.styles.ts
@@ -1,7 +1,7 @@
-import { ButtonGlobalClassNames } from "@fluentui/react/lib/components/Button/BaseButton.classNames";
 import { getFocusStyle, getGlobalClassNames, HighContrastSelector } from "@fluentui/react/lib/Styling";
 import { getRTL } from "@fluentui/react/lib/Utilities";
 import { ITermItemStyleProps, ITermItemStyles } from "../modernTermPicker/ModernTermPicker.types";
+import { ButtonGlobalClassNames } from "@fluentui/react/lib/Button";
 
 const GlobalClassNames = {
   root: 'ms-TagItem',
diff --git a/src/controls/modernTaxonomyPicker/termItem/TermItem.tsx b/src/controls/modernTaxonomyPicker/termItem/TermItem.tsx
index 282dc459c..f02f85e72 100644
--- a/src/controls/modernTaxonomyPicker/termItem/TermItem.tsx
+++ b/src/controls/modernTaxonomyPicker/termItem/TermItem.tsx
@@ -1,8 +1,9 @@
-import { IconButton } from '@fluentui/react/lib/components/Button/IconButton/IconButton';
+
 import { classNamesFunction, styled } from '@fluentui/react/lib/Utilities';
 import * as React from 'react';
 import { ITermItemProps, ITermItemStyleProps, ITermItemStyles } from '../modernTermPicker/ModernTermPicker.types';
 import { getStyles } from './TermItem.styles';
+import { IconButton } from '@fluentui/react/lib/Button';
 
 const getClassNames = classNamesFunction<ITermItemStyleProps, ITermItemStyles>();
 
diff --git a/src/controls/monacoEditor/Error.tsx b/src/controls/monacoEditor/Error.tsx
index 7647cf491..bbd1c1473 100644
--- a/src/controls/monacoEditor/Error.tsx
+++ b/src/controls/monacoEditor/Error.tsx
@@ -1,5 +1,5 @@
 
-import { Stack } from "@fluentui/react/lib/components/Stack";
+import { Stack } from "@fluentui/react/lib/Stack";
 import { MessageBarType, MessageBar } from "@fluentui/react/lib/MessageBar";
 import * as React from "react";
 
diff --git a/src/controls/peoplepicker/IPeoplePicker.ts b/src/controls/peoplepicker/IPeoplePicker.ts
index e8af7cbb4..294b4c790 100644
--- a/src/controls/peoplepicker/IPeoplePicker.ts
+++ b/src/controls/peoplepicker/IPeoplePicker.ts
@@ -1,6 +1,5 @@
-import { IBasePickerStyles } from "@fluentui/react";
-import { DirectionalHint } from "@fluentui/react/lib/common/DirectionalHint";
-import { IPersonaProps } from "@fluentui/react/lib/components/Persona/Persona.types";
+import { IBasePickerStyles, IPersonaProps } from "@fluentui/react";
+import { DirectionalHint } from '@fluentui/react/lib/Callout';
 import { IPeoplePickerContext, PrincipalType } from ".";
 
 /**
diff --git a/src/controls/peoplepicker/PeoplePickerComponent.tsx b/src/controls/peoplepicker/PeoplePickerComponent.tsx
index 511d86d74..b43681c87 100644
--- a/src/controls/peoplepicker/PeoplePickerComponent.tsx
+++ b/src/controls/peoplepicker/PeoplePickerComponent.tsx
@@ -6,13 +6,12 @@ import SPPeopleSearchService from "../../services/PeopleSearchService";
 import { IPeoplePickerProps } from './IPeoplePicker';
 import { TooltipHost } from '@fluentui/react/lib/Tooltip';
 import { DirectionalHint } from '@fluentui/react/lib/Callout';
-import { NormalPeoplePicker } from '@fluentui/react/lib/components/pickers/PeoplePicker/PeoplePicker';
-import { Label } from '@fluentui/react/lib/components/Label';
-import { IBasePickerSuggestionsProps } from "@fluentui/react/lib/components/pickers/BasePicker.types";
-import { IPersonaProps } from "@fluentui/react/lib/components/Persona/Persona.types";
+import { Label } from '@fluentui/react/lib/Label';
 import FieldErrorMessage from '../errorMessage/ErrorMessage';
 import isEqual from 'lodash/isEqual';
 import uniqBy from 'lodash/uniqBy';
+import { IPersonaProps } from '@fluentui/react/lib/Persona';
+import { IBasePickerSuggestionsProps, NormalPeoplePicker} from '@fluentui/react/lib/Pickers';
 
 interface IPeoplePickerState {
   mostRecentlyUsedPersons?: IPersonaProps[];
diff --git a/src/controls/placeholder/PlaceholderComponent.tsx b/src/controls/placeholder/PlaceholderComponent.tsx
index 961899516..e5fc0fa2b 100644
--- a/src/controls/placeholder/PlaceholderComponent.tsx
+++ b/src/controls/placeholder/PlaceholderComponent.tsx
@@ -1,7 +1,7 @@
 import { ThemeContext } from '@fluentui/react-theme-provider/lib/ThemeContext';
 import { Theme } from '@fluentui/react-theme-provider/lib/types';
 import { PrimaryButton } from '@fluentui/react/lib/Button';
-import { Icon } from '@fluentui/react/lib/components/Icon';
+import { Icon } from '@fluentui/react/lib/Icon';
 import * as React from 'react';
 import { IPlaceholderState } from '.';
 import * as telemetry from '../../common/telemetry';
diff --git a/src/controls/taxonomyPicker/TaxonomyPicker.tsx b/src/controls/taxonomyPicker/TaxonomyPicker.tsx
index 38b5831ed..b91d2297e 100644
--- a/src/controls/taxonomyPicker/TaxonomyPicker.tsx
+++ b/src/controls/taxonomyPicker/TaxonomyPicker.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import { PrimaryButton, DefaultButton, IconButton } from '@fluentui/react/lib/Button';
 import { Panel, PanelType } from '@fluentui/react/lib/Panel';
 import { Spinner, SpinnerSize } from '@fluentui/react/lib/Spinner';
-import { Autofill } from '@fluentui/react/lib/components/Autofill/Autofill';
 import { Label } from '@fluentui/react/lib/Label';
 import TermPicker from './TermPicker';
 import { IPickerTerms, IPickerTerm } from './ITermPicker';
@@ -18,6 +17,7 @@ import FieldErrorMessage from '../errorMessage/ErrorMessage';
 import { initializeIcons } from '@uifabric/icons';
 import * as telemetry from '../../common/telemetry';
 import { EmptyGuid } from '../../common/Constants';
+import { Autofill } from '@fluentui/react/lib/Autofill';
 
 /**
  * Image URLs / Base64
diff --git a/src/controls/taxonomyPicker/TermPicker.tsx b/src/controls/taxonomyPicker/TermPicker.tsx
index 5843acec6..db00548d3 100644
--- a/src/controls/taxonomyPicker/TermPicker.tsx
+++ b/src/controls/taxonomyPicker/TermPicker.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BasePicker, IBasePickerProps, IInputProps, IPickerItemProps } from '@fluentui/react/lib/Pickers';
+import { Autofill, BasePicker, IBasePickerProps, IInputProps, IPickerItemProps } from '@fluentui/react/lib/Pickers';
 import { IPickerTerm, IPickerTerms } from './ITermPicker';
 import SPTermStorePickerService from './../../services/SPTermStorePickerService';
 import styles from './TaxonomyPicker.module.scss';
@@ -8,7 +8,6 @@ import { BaseComponentContext } from '@microsoft/sp-component-base';
 import * as strings from 'ControlStrings';
 import { Icon } from '@fluentui/react/lib/Icon';
 import { ITermSet } from "../../services/ISPTermStorePickerService";
-import { Autofill } from '@fluentui/react/lib/components/Autofill/Autofill';
 import { LegacyRef, KeyboardEvent } from 'react';
 
 export class TermBasePicker extends BasePicker<IPickerTerm, IBasePickerProps<IPickerTerm>>
diff --git a/src/controls/toolbar/InFlowToolbarItem.tsx b/src/controls/toolbar/InFlowToolbarItem.tsx
index f6d43160f..10f6bf854 100644
--- a/src/controls/toolbar/InFlowToolbarItem.tsx
+++ b/src/controls/toolbar/InFlowToolbarItem.tsx
@@ -6,11 +6,11 @@ import {
     tooltipAsLabelBehavior
 } from "@fluentui/react-northstar";
 import { cloneDeep } from "@microsoft/sp-lodash-subset";
-import { Icon } from "@fluentui/react/lib/components/Icon/Icon";
 import * as React from "react";
 import { TAction } from "../../common/model/TAction";
 import styles from "./Toolbar.module.scss";
 import { TToolbarLayout } from "./ToolbarActionsUtils";
+import { Icon } from "@fluentui/react/lib/Icon";
 
 interface IInFlowToolbarItemProps {
     action: TAction;
diff --git a/src/controls/toolbar/Toolbar.tsx b/src/controls/toolbar/Toolbar.tsx
index 6507a3f6d..eaac588df 100644
--- a/src/controls/toolbar/Toolbar.tsx
+++ b/src/controls/toolbar/Toolbar.tsx
@@ -15,11 +15,11 @@ import { ToolbarFind } from "./ToolbarFind";
 import { ToolbarTheme } from "./ToolbarTheme";
 
 import "./toolbar.css";
-import { Icon } from "@fluentui/react/lib/components/Icon/Icon";
 import { InFlowToolbarItem, toolbarMenuProps } from "./InFlowToolbarItem";
 import styles from "./Toolbar.module.scss";
 import { flattenedActions, getInFlowToolbarItems, getOverflowToolbarItems, TActionGroups, TFilters, TToolbarItems, TToolbarLayout } from "./ToolbarActionsUtils";
 import { useTelemetry } from "../../common/telemetry";
+import { Icon } from "@fluentui/react/lib/Icon";
 
 /**
  * Toolbar props
diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx
index 39ee5cce7..d1ba83914 100644
--- a/src/webparts/controlsTest/components/ControlsTest.tsx
+++ b/src/webparts/controlsTest/components/ControlsTest.tsx
@@ -15,14 +15,14 @@ import {
 import {
   DefaultButton,
   PrimaryButton
-} from "@fluentui/react/lib/components/Button";
-import { DialogType, DialogFooter, IDialogContentProps } from "@fluentui/react/lib/components/Dialog";
+} from "@fluentui/react/lib/Button";
+import { DialogType, DialogFooter, IDialogContentProps } from "@fluentui/react/lib/Dialog";
 import { IModalProps } from "@fluentui/react/lib/Modal";
 import {
   Dropdown,
   IDropdownOption
-} from "@fluentui/react/lib/components/Dropdown";
-import { Link } from "@fluentui/react/lib/components/Link";
+} from "@fluentui/react/lib/Dropdown";
+import { Link } from "@fluentui/react/lib/Link";
 import {
   DocumentCard,
   DocumentCardActivity,
diff --git a/src/webparts/controlsTest/propertyPane/controls/ListPicker.tsx b/src/webparts/controlsTest/propertyPane/controls/ListPicker.tsx
index 3ae5521a0..936a27b2d 100644
--- a/src/webparts/controlsTest/propertyPane/controls/ListPicker.tsx
+++ b/src/webparts/controlsTest/propertyPane/controls/ListPicker.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { Dropdown, IDropdownOption } from '@fluentui/react/lib/components/Dropdown';
-import { Spinner } from '@fluentui/react/lib/components/Spinner';
+import { Dropdown, IDropdownOption } from '@fluentui/react/lib/Dropdown';
+import { Spinner } from '@fluentui/react/lib/Spinner';
 import { SPHttpClient } from "@microsoft/sp-http";
 import { WebPartContext } from '@microsoft/sp-webpart-base';
 import { ISPList } from '../../../../common/SPEntities';