diff --git a/__tests__/src/components/App.test.js b/__tests__/src/components/App.test.js
index 2a246c7a47d8116f84e6a8436968ebbcd6123fc6..4a9b939663e61883d499bdd2edd2fefe41e1bdeb 100644
--- a/__tests__/src/components/App.test.js
+++ b/__tests__/src/components/App.test.js
@@ -5,7 +5,7 @@ import Fullscreen from 'react-fullscreen-crossbrowser';
 import WorkspaceControlPanel from '../../../src/containers/WorkspaceControlPanel';
 import Workspace from '../../../src/containers/Workspace';
 import WorkspaceAdd from '../../../src/containers/WorkspaceAdd';
-import App from '../../../src/components/App';
+import { App } from '../../../src/components/App';
 import settings from '../../../src/config/settings';
 import i18n from '../../../src/i18n';
 
diff --git a/__tests__/src/components/CanvasThumbnail.test.js b/__tests__/src/components/CanvasThumbnail.test.js
index afc3798f437e962d88a378765f20845352145434..f3fa0904adba3805658180cf95f5ec4df2130b45 100644
--- a/__tests__/src/components/CanvasThumbnail.test.js
+++ b/__tests__/src/components/CanvasThumbnail.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import IntersectionObserver from '@researchgate/react-intersection-observer';
-import CanvasThumbnail from '../../../src/components/CanvasThumbnail';
+import { CanvasThumbnail } from '../../../src/components/CanvasThumbnail';
 
 describe('CanvasThumbnail', () => {
   let wrapper;
diff --git a/__tests__/src/components/CompanionWindow.test.js b/__tests__/src/components/CompanionWindow.test.js
index 13ba8c1de3fe8b1f7d0744010b9061e209327d6f..c67b60fc367fbb4163c88e0272a60819443c6300 100644
--- a/__tests__/src/components/CompanionWindow.test.js
+++ b/__tests__/src/components/CompanionWindow.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import CompanionWindow from '../../../src/components/CompanionWindow';
+import { CompanionWindow } from '../../../src/components/CompanionWindow';
 import WindowSideBarInfoPanel from '../../../src/containers/WindowSideBarInfoPanel';
 
 /** create wrapper */
diff --git a/__tests__/src/components/LabelValueMetadata.test.js b/__tests__/src/components/LabelValueMetadata.test.js
index 24d4d0ce204bb04944861bf44c2a9c0b601243fa..8e8f777c60575797fc40d94ac9457e25cceb5632 100644
--- a/__tests__/src/components/LabelValueMetadata.test.js
+++ b/__tests__/src/components/LabelValueMetadata.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import SanitizedHtml from '../../../src/components/SanitizedHtml';
-import LabelValueMetadata from '../../../src/components/LabelValueMetadata';
+import { LabelValueMetadata } from '../../../src/components/LabelValueMetadata';
+import { SanitizedHtml } from '../../../src/components/SanitizedHtml';
 
 describe('LabelValueMetadata', () => {
   let wrapper;
diff --git a/__tests__/src/components/LanguageSettings.test.js b/__tests__/src/components/LanguageSettings.test.js
index 8ae798ec89479cf348e61fa0a293d09b6ff7cd20..ca216cb5f90c286e5b6d5bf36593de6a07897ddb 100644
--- a/__tests__/src/components/LanguageSettings.test.js
+++ b/__tests__/src/components/LanguageSettings.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import LanguageSettings from '../../../src/components/LanguageSettings';
+import { LanguageSettings } from '../../../src/components/LanguageSettings';
 
 /**
  * Helper function to create a shallow wrapper around LanguageSettings
diff --git a/__tests__/src/components/ManifestForm.test.js b/__tests__/src/components/ManifestForm.test.js
index 6da90f81ab6a73858eb34e1f3081fcef391019d1..9808c4ebff3f67975764527a134639d479e3ff1f 100644
--- a/__tests__/src/components/ManifestForm.test.js
+++ b/__tests__/src/components/ManifestForm.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import ManifestForm from '../../../src/components/ManifestForm';
+import { ManifestForm } from '../../../src/components/ManifestForm';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/ManifestListItem.test.js b/__tests__/src/components/ManifestListItem.test.js
index 142af43e4b6149fa405a659885b8c4d3ddec4fd0..2e269269a4a7a97b03bc06b7e073b1ff47dbdd3a 100644
--- a/__tests__/src/components/ManifestListItem.test.js
+++ b/__tests__/src/components/ManifestListItem.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import ManifestListItem from '../../../src/components/ManifestListItem';
+import { ManifestListItem } from '../../../src/components/ManifestListItem';
 import ManifestListItemError from '../../../src/containers/ManifestListItemError';
 
 /** */
diff --git a/__tests__/src/components/ManifestListItemError.test.js b/__tests__/src/components/ManifestListItemError.test.js
index 5d84fd79a1192d63c363252871aabef79c9e7340..9edcdbc5a64ce9a6739087383545770235a46261 100644
--- a/__tests__/src/components/ManifestListItemError.test.js
+++ b/__tests__/src/components/ManifestListItemError.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import Typography from '@material-ui/core/Typography';
-import ManifestListItemError from '../../../src/components/ManifestListItemError';
+import { ManifestListItemError } from '../../../src/components/ManifestListItemError';
 
 /**
  * Helper function to wrap creating a ManifestListItemError component
diff --git a/__tests__/src/components/NestedMenu.test.js b/__tests__/src/components/NestedMenu.test.js
index 422b947ecb2618fba15b951a88c75dce8ee3d18e..0ba34a7c44d99dc44452e8e364c730df5717731d 100644
--- a/__tests__/src/components/NestedMenu.test.js
+++ b/__tests__/src/components/NestedMenu.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import NestedMenu from '../../../src/components/NestedMenu';
+import { NestedMenu } from '../../../src/components/NestedMenu';
 
 /**
  * Helper function to wrap creating a NestedMenu component
diff --git a/__tests__/src/components/OpenSeadragonViewer.test.js b/__tests__/src/components/OpenSeadragonViewer.test.js
index 58f96bbe4daf8873f0af6e17a74f97644d0dc48d..1b387e1cf924ba4b64910bb5885ff470cf9eea0a 100644
--- a/__tests__/src/components/OpenSeadragonViewer.test.js
+++ b/__tests__/src/components/OpenSeadragonViewer.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import OpenSeadragon from 'openseadragon';
-import OpenSeadragonViewer from '../../../src/components/OpenSeadragonViewer';
+import { OpenSeadragonViewer } from '../../../src/components/OpenSeadragonViewer';
 
 jest.mock('openseadragon');
 
diff --git a/__tests__/src/components/SanitizedHtml.test.js b/__tests__/src/components/SanitizedHtml.test.js
index 9d62c9e02d342fe44fa919eb1d13211ff728b0dc..541aa50a258b3a191ca2a1f7677e2aa49b9fe824 100644
--- a/__tests__/src/components/SanitizedHtml.test.js
+++ b/__tests__/src/components/SanitizedHtml.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import SanitizedHtml from '../../../src/components/SanitizedHtml';
+import { SanitizedHtml } from '../../../src/components/SanitizedHtml';
 
 const wrapper = shallow(
   <SanitizedHtml
diff --git a/__tests__/src/components/ThumbnailNavigation.test.js b/__tests__/src/components/ThumbnailNavigation.test.js
index f479471c387e4184b4ffbd53137d970777a30253..133465a26840f422cbc32593703b37b4e72e1949 100644
--- a/__tests__/src/components/ThumbnailNavigation.test.js
+++ b/__tests__/src/components/ThumbnailNavigation.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import Grid from 'react-virtualized/dist/commonjs/Grid';
 import manifesto from 'manifesto.js';
-import ThumbnailNavigation from '../../../src/components/ThumbnailNavigation';
+import { ThumbnailNavigation } from '../../../src/components/ThumbnailNavigation';
 import CanvasGroupings from '../../../src/lib/CanvasGroupings';
 import manifestJson from '../../fixtures/version-2/019.json';
 
diff --git a/__tests__/src/components/ViewerNavigation.test.js b/__tests__/src/components/ViewerNavigation.test.js
index fdcee7d86830171774f0023ef192045883ba1777..5e6408cddb3eb90ae2f10be6163828c1f13cb63b 100644
--- a/__tests__/src/components/ViewerNavigation.test.js
+++ b/__tests__/src/components/ViewerNavigation.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import ViewerNavigation from '../../../src/components/ViewerNavigation';
+import { ViewerNavigation } from '../../../src/components/ViewerNavigation';
 
 describe('ViewerNavigation', () => {
   let wrapper;
diff --git a/__tests__/src/components/Window.test.js b/__tests__/src/components/Window.test.js
index 9a2e2587c96efc89274f281cd68508dbc176219d..2f7928581db4792ae2a82d66f405bd12a38c1b6e 100644
--- a/__tests__/src/components/Window.test.js
+++ b/__tests__/src/components/Window.test.js
@@ -1,9 +1,14 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Window from '../../../src/components/Window';
+import { Window } from '../../../src/components/Window';
 import WindowTopBar from '../../../src/containers/WindowTopBar';
 import WindowMiddleContent from '../../../src/containers/WindowMiddleContent';
 
+/** create wrapper */
+function createWrapper(window) {
+  return shallow(<Window window={window} />);
+}
+
 describe('Window', () => {
   let wrapper;
   const window = { id: 123, xywh: [0, 0, 400, 500] };
@@ -12,19 +17,19 @@ describe('Window', () => {
     expect(wrapper.find('.mirador-window')).toHaveLength(0);
   });
   it('should render outer element', () => {
-    wrapper = shallow(<Window window={window} />);
+    wrapper = createWrapper(window);
     expect(wrapper.find('.mirador-window')).toHaveLength(1);
   });
   it('should render <WindowTopBar>', () => {
-    wrapper = shallow(<Window window={window} />);
+    wrapper = createWrapper(window);
     expect(wrapper.find(WindowTopBar)).toHaveLength(1);
   });
   it('should render <WindowMiddleContent>', () => {
-    wrapper = shallow(<Window window={window} />);
+    wrapper = createWrapper(window);
     expect(wrapper.find(WindowMiddleContent)).toHaveLength(1);
   });
   it('should render bottom companions window areas', () => {
-    wrapper = shallow(<Window window={window} />);
+    wrapper = createWrapper(window);
     expect(wrapper.find('.mirador-companion-bottom')).toHaveLength(1);
   });
 });
diff --git a/__tests__/src/components/WindowList.test.js b/__tests__/src/components/WindowList.test.js
index 0bc7a7e143d131c70a935633b51c503bba976f89..06c65b65db9ecbec83ed1d23d96898131557f914 100644
--- a/__tests__/src/components/WindowList.test.js
+++ b/__tests__/src/components/WindowList.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import MenuItem from '@material-ui/core/MenuItem';
-import WindowList from '../../../src/components/WindowList';
+import { WindowList } from '../../../src/components/WindowList';
 
 describe('WindowList', () => {
   let wrapper;
diff --git a/__tests__/src/components/WindowMiddleContent.test.js b/__tests__/src/components/WindowMiddleContent.test.js
index 64da2c84b34af25fa14cb51b23809348ef418e74..17a56c1b6c53413dadec7304a341883efd89edac 100644
--- a/__tests__/src/components/WindowMiddleContent.test.js
+++ b/__tests__/src/components/WindowMiddleContent.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WindowMiddleContent from '../../../src/components/WindowMiddleContent';
+import { WindowMiddleContent } from '../../../src/components/WindowMiddleContent';
 import CompanionWindow from '../../../src/containers/CompanionWindow';
 import WindowSideBar from '../../../src/containers/WindowSideBar';
 import WindowViewer from '../../../src/containers/WindowViewer';
diff --git a/__tests__/src/components/WindowSideBar.test.js b/__tests__/src/components/WindowSideBar.test.js
index be0694041bb622300f71f9d67c930a6acc418dd1..8f7acc8b6e914b48b44e73113cf98487e14d6a94 100644
--- a/__tests__/src/components/WindowSideBar.test.js
+++ b/__tests__/src/components/WindowSideBar.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WindowSideBar from '../../../src/components/WindowSideBar';
+import { WindowSideBar } from '../../../src/components/WindowSideBar';
 
 describe('WindowSideBar', () => {
   let wrapper;
diff --git a/__tests__/src/components/WindowSideBarButtons.test.js b/__tests__/src/components/WindowSideBarButtons.test.js
index b57978af86b66edb99bb61010868908957f6e9ad..6c1a532724346ff929e3809813679ff122d2605c 100644
--- a/__tests__/src/components/WindowSideBarButtons.test.js
+++ b/__tests__/src/components/WindowSideBarButtons.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WindowSideBarButtons from '../../../src/components/WindowSideBarButtons';
+import { WindowSideBarButtons } from '../../../src/components/WindowSideBarButtons';
 
 describe('WindowSideBarButtons', () => {
   let wrapper;
diff --git a/__tests__/src/components/WindowSideBarCanvasPanel.test.js b/__tests__/src/components/WindowSideBarCanvasPanel.test.js
index 3ca22f646c615f08aa25da2db4686216fca45044..14bbf84443cf53ab80b467971eee0b4537565fae 100644
--- a/__tests__/src/components/WindowSideBarCanvasPanel.test.js
+++ b/__tests__/src/components/WindowSideBarCanvasPanel.test.js
@@ -4,8 +4,8 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import Typography from '@material-ui/core/Typography';
 import manifesto from 'manifesto.js';
-import WindowSideBarCanvasPanel from '../../../src/components/WindowSideBarCanvasPanel';
-import CanvasThumbnail from '../../../src/components/CanvasThumbnail';
+import { CanvasThumbnail } from '../../../src/components/CanvasThumbnail';
+import { WindowSideBarCanvasPanel } from '../../../src/components/WindowSideBarCanvasPanel';
 import manifestJson from '../../fixtures/version-2/019.json';
 import { getIdAndLabelOfCanvases } from '../../../src/state/selectors';
 
diff --git a/__tests__/src/components/WindowSideBarInfoPanel.test.js b/__tests__/src/components/WindowSideBarInfoPanel.test.js
index 4fdf5f8b940428eebf7e3d7864191dfb3aa2f209..a6c69f1a4f2e2932597ffa96cd4912ce64261f73 100644
--- a/__tests__/src/components/WindowSideBarInfoPanel.test.js
+++ b/__tests__/src/components/WindowSideBarInfoPanel.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import Typography from '@material-ui/core/Typography';
-import WindowSideBarInfoPanel from '../../../src/components/WindowSideBarInfoPanel';
-import SanitizedHtml from '../../../src/components/SanitizedHtml';
-import LabelValueMetadata from '../../../src/components/LabelValueMetadata';
+import { WindowSideBarInfoPanel } from '../../../src/components/WindowSideBarInfoPanel';
+import { LabelValueMetadata } from '../../../src/components/LabelValueMetadata';
+import { SanitizedHtml } from '../../../src/components/SanitizedHtml';
 
 describe('WindowSideBarInfoPanel', () => {
   const metadata = [{ label: {}, value: {} }];
diff --git a/__tests__/src/components/WindowSideBarPanel.test.js b/__tests__/src/components/WindowSideBarPanel.test.js
index db8fcece78b358fbd7dbea074dc12df672584aa4..3381b62c7baf189dcd89202d497964a03dc9c3c3 100644
--- a/__tests__/src/components/WindowSideBarPanel.test.js
+++ b/__tests__/src/components/WindowSideBarPanel.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WindowSideBarPanel from '../../../src/components/WindowSideBarPanel';
+import { WindowSideBarPanel } from '../../../src/components/WindowSideBarPanel';
 import WindowSideBarInfoPanel from '../../../src/containers/WindowSideBarInfoPanel';
 
 describe('WindowSideBarPanel', () => {
diff --git a/__tests__/src/components/WindowThumbnailSettings.test.js b/__tests__/src/components/WindowThumbnailSettings.test.js
index 7b835555a7e0c9c24a1b2bf37e0aa743c27030d7..4227beee5b0aa9ff946a1edfeb51d91d3ebc09be 100644
--- a/__tests__/src/components/WindowThumbnailSettings.test.js
+++ b/__tests__/src/components/WindowThumbnailSettings.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import RadioGroup from '@material-ui/core/RadioGroup';
 import Typography from '@material-ui/core/Typography';
-import WindowThumbnailSettings from '../../../src/components/WindowThumbnailSettings';
+import { WindowThumbnailSettings } from '../../../src/components/WindowThumbnailSettings';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WindowTopBar.test.js b/__tests__/src/components/WindowTopBar.test.js
index 94c0c0f2d4b807ed4eb0c8e569306b650455cb3f..d2ac3dc29544199061879245ac58c7cdd2da3756 100644
--- a/__tests__/src/components/WindowTopBar.test.js
+++ b/__tests__/src/components/WindowTopBar.test.js
@@ -10,7 +10,7 @@ import AppBar from '@material-ui/core/AppBar';
 import WindowTopMenuButton from '../../../src/containers/WindowTopMenuButton';
 import WindowTopBarButtons from '../../../src/containers/WindowTopBarButtons';
 import WindowIcon from '../../../src/containers/WindowIcon';
-import WindowTopBar from '../../../src/components/WindowTopBar';
+import { WindowTopBar } from '../../../src/components/WindowTopBar';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WindowTopBarButtons.test.js b/__tests__/src/components/WindowTopBarButtons.test.js
index cf4cf3436c83c5e1a48465bcea1bba9c235d3d4b..2f9f39f622968b12b81211adfce5234fb663c205 100644
--- a/__tests__/src/components/WindowTopBarButtons.test.js
+++ b/__tests__/src/components/WindowTopBarButtons.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WindowTopBarButtons from '../../../src/components/WindowTopBarButtons';
+import { WindowTopBarButtons } from '../../../src/components/WindowTopBarButtons';
 
 describe('WindowTopBarButtons', () => {
   let wrapper;
diff --git a/__tests__/src/components/WindowTopMenu.test.js b/__tests__/src/components/WindowTopMenu.test.js
index 0ad07676705bc7bb95165aa4be531e00169aa040..db9671e41d370fde81b7e21d80d25ee62e0b12f5 100644
--- a/__tests__/src/components/WindowTopMenu.test.js
+++ b/__tests__/src/components/WindowTopMenu.test.js
@@ -5,7 +5,7 @@ import Menu from '@material-ui/core/Menu';
 import Divider from '@material-ui/core/Divider';
 import WindowThumbnailSettings from '../../../src/containers/WindowThumbnailSettings';
 import WindowViewSettings from '../../../src/containers/WindowViewSettings';
-import WindowTopMenu from '../../../src/components/WindowTopMenu';
+import { WindowTopMenu } from '../../../src/components/WindowTopMenu';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WindowTopMenuButton.test.js b/__tests__/src/components/WindowTopMenuButton.test.js
index 7da21e820d7252668e7a46034fb13338a19d1857..498a65f0d97d8e180b45ba97ab7bdd4f8f4cd396 100644
--- a/__tests__/src/components/WindowTopMenuButton.test.js
+++ b/__tests__/src/components/WindowTopMenuButton.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import IconButton from '@material-ui/core/IconButton';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
 import WindowTopMenu from '../../../src/containers/WindowTopMenu';
-import WindowTopMenuButton from '../../../src/components/WindowTopMenuButton';
+import { WindowTopMenuButton } from '../../../src/components/WindowTopMenuButton';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WindowViewSettings.test.js b/__tests__/src/components/WindowViewSettings.test.js
index cf3318c18c8c3c2be4f9a2f9333accad537382e8..7900f51238b6f394f40322629689dd38217bcfe0 100644
--- a/__tests__/src/components/WindowViewSettings.test.js
+++ b/__tests__/src/components/WindowViewSettings.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import RadioGroup from '@material-ui/core/RadioGroup';
 import Typography from '@material-ui/core/Typography';
-import WindowViewSettings from '../../../src/components/WindowViewSettings';
+import { WindowViewSettings } from '../../../src/components/WindowViewSettings';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WindowViewer.test.js b/__tests__/src/components/WindowViewer.test.js
index 0d0e21f59a45f7e7762dbc25b1fd0c436f0757b9..3950378fc069a534472df2ab5ffa205fba369a56 100644
--- a/__tests__/src/components/WindowViewer.test.js
+++ b/__tests__/src/components/WindowViewer.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import manifesto from 'manifesto.js';
-import WindowViewer from '../../../src/components/WindowViewer';
+import { WindowViewer } from '../../../src/components/WindowViewer';
 import OSDViewer from '../../../src/containers/OpenSeadragonViewer';
 import ViewerNavigation from '../../../src/containers/ViewerNavigation';
 import fixture from '../../fixtures/version-2/019.json';
diff --git a/__tests__/src/components/Workspace.test.js b/__tests__/src/components/Workspace.test.js
index 9a9ce3af51e1d9c16d36fd9d3b87b9f7902bb331..83ff8808fdcaaf11e049ba712369c2a867d7c740 100644
--- a/__tests__/src/components/Workspace.test.js
+++ b/__tests__/src/components/Workspace.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import WorkspaceMosaic from '../../../src/containers/WorkspaceMosaic';
 import Window from '../../../src/containers/Window';
-import Workspace from '../../../src/components/Workspace';
+import { Workspace } from '../../../src/components/Workspace';
 
 const windows = { 1: { id: 1 }, 2: { id: 2 } };
 
diff --git a/__tests__/src/components/WorkspaceAdd.test.js b/__tests__/src/components/WorkspaceAdd.test.js
index cd0c32b0ec49304f32ec81940789460e2c62ace8..12e873a13935d6067ca6300a6312af775945dcde 100644
--- a/__tests__/src/components/WorkspaceAdd.test.js
+++ b/__tests__/src/components/WorkspaceAdd.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceAdd from '../../../src/components/WorkspaceAdd';
+import { WorkspaceAdd } from '../../../src/components/WorkspaceAdd';
 import ManifestListItem from '../../../src/containers/ManifestListItem';
 import fixture from '../../fixtures/version-2/002.json';
 import ManifestForm from '../../../src/containers/ManifestForm';
diff --git a/__tests__/src/components/WorkspaceAddButton.test.js b/__tests__/src/components/WorkspaceAddButton.test.js
index 9c1fea0831216e04b0fd7ce11ee2f3e5b9018ac9..2e1df73ef446d0d5018bd6e14736b74d78678874 100644
--- a/__tests__/src/components/WorkspaceAddButton.test.js
+++ b/__tests__/src/components/WorkspaceAddButton.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import Fab from '@material-ui/core/Fab';
 import AddIcon from '@material-ui/icons/Add';
 import ClearIcon from '@material-ui/icons/Clear';
-import WorkspaceAddButton from '../../../src/components/WorkspaceAddButton';
+import { WorkspaceAddButton } from '../../../src/components/WorkspaceAddButton';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WorkspaceControlPanel.test.js b/__tests__/src/components/WorkspaceControlPanel.test.js
index 31e59d0a45fa1c752aa5199e6dcd2e06eacf03cc..1533a6f225c43f94ccba81a3dc6f1abe781cd2bb 100644
--- a/__tests__/src/components/WorkspaceControlPanel.test.js
+++ b/__tests__/src/components/WorkspaceControlPanel.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import createStore from '../../../src/state/createStore';
 import * as actions from '../../../src/state/actions';
-import WorkspaceControlPanel from '../../../src/components/WorkspaceControlPanel';
+import { WorkspaceControlPanel } from '../../../src/components/WorkspaceControlPanel';
 import fixture from '../../fixtures/version-2/002.json';
 
 describe('WorkspaceControlPanel', () => {
diff --git a/__tests__/src/components/WorkspaceControlPanelButtons.test.js b/__tests__/src/components/WorkspaceControlPanelButtons.test.js
index a66c8dcb5c7b0d7b37fdc4d746d0421d700435d0..c9de36d097880906ecbe1ae195cbd18ef66e6f7d 100644
--- a/__tests__/src/components/WorkspaceControlPanelButtons.test.js
+++ b/__tests__/src/components/WorkspaceControlPanelButtons.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import WorkspaceFullScreenButton from '../../../src/containers/WorkspaceFullScreenButton';
-import WorkspaceControlPanelButtons
+import { WorkspaceControlPanelButtons }
   from '../../../src/components/WorkspaceControlPanelButtons';
 
 describe('WorkspaceControlPanelButtons', () => {
diff --git a/__tests__/src/components/WorkspaceExport.test.js b/__tests__/src/components/WorkspaceExport.test.js
index 17ea78605f4b86be60fb97f587727aa23b1a089f..bf2a890c955b75b19d3ee04f0460d76e8a917782 100644
--- a/__tests__/src/components/WorkspaceExport.test.js
+++ b/__tests__/src/components/WorkspaceExport.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceExport from '../../../src/components/WorkspaceExport';
+import { WorkspaceExport } from '../../../src/components/WorkspaceExport';
 
 describe('WorkspaceExport', () => {
   let wrapper;
diff --git a/__tests__/src/components/WorkspaceFullScreenButton.test.js b/__tests__/src/components/WorkspaceFullScreenButton.test.js
index 88598ae501a05afb97c54fa38c385753f5643b60..15b78886551d6aea044fa5203c2c5ee0d5a8b83a 100644
--- a/__tests__/src/components/WorkspaceFullScreenButton.test.js
+++ b/__tests__/src/components/WorkspaceFullScreenButton.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceFullScreenButton from '../../../src/components/WorkspaceFullScreenButton';
+import { WorkspaceFullScreenButton } from '../../../src/components/WorkspaceFullScreenButton';
 
 describe('WorkspaceFullScreenButton', () => {
   let wrapper;
diff --git a/__tests__/src/components/WorkspaceMenu.test.js b/__tests__/src/components/WorkspaceMenu.test.js
index c7b76b66149c0670d51043329cf8adcab09e7af7..0dbfcd067d59524533c82a6ff0f9b581815cb858 100644
--- a/__tests__/src/components/WorkspaceMenu.test.js
+++ b/__tests__/src/components/WorkspaceMenu.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceMenu from '../../../src/components/WorkspaceMenu';
+import { WorkspaceMenu } from '../../../src/components/WorkspaceMenu';
 import WindowList from '../../../src/containers/WindowList';
 
 describe('WorkspaceMenu', () => {
diff --git a/__tests__/src/components/WorkspaceMenuButton.test.js b/__tests__/src/components/WorkspaceMenuButton.test.js
index ba48a869e7781e5de14b23f2fdafe954ef95f77a..a1ab0da0075e4781a88ad7ee37b4609f332e37fd 100644
--- a/__tests__/src/components/WorkspaceMenuButton.test.js
+++ b/__tests__/src/components/WorkspaceMenuButton.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceMenuButton from '../../../src/components/WorkspaceMenuButton';
+import { WorkspaceMenuButton } from '../../../src/components/WorkspaceMenuButton';
 
 describe('WorkspaceMenuButton', () => {
   let wrapper;
diff --git a/__tests__/src/components/WorkspaceMosaic.test.js b/__tests__/src/components/WorkspaceMosaic.test.js
index ea11f83901d10ba4db813e654cca6530561cacfd..01bfd5a2557b6122c2374dfe1d1684de91c20e7e 100644
--- a/__tests__/src/components/WorkspaceMosaic.test.js
+++ b/__tests__/src/components/WorkspaceMosaic.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { Mosaic } from 'react-mosaic-component';
-import WorkspaceMosaic from '../../../src/components/WorkspaceMosaic';
+import { WorkspaceMosaic } from '../../../src/components/WorkspaceMosaic';
 
 /** create wrapper */
 function createWrapper(props) {
diff --git a/__tests__/src/components/WorkspaceSettings.test.js b/__tests__/src/components/WorkspaceSettings.test.js
index 13e16819106e3cec48f813d41056ee7dabe2a0b2..8f1ffa434108f9a812d3f26c7cac1b7a4b4a3842 100644
--- a/__tests__/src/components/WorkspaceSettings.test.js
+++ b/__tests__/src/components/WorkspaceSettings.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import WorkspaceSettings from '../../../src/components/WorkspaceSettings';
+import { WorkspaceSettings } from '../../../src/components/WorkspaceSettings';
 import settings from '../../../src/config/settings';
 
 describe('WorkspaceSettings', () => {
diff --git a/__tests__/src/components/ZoomControls.test.js b/__tests__/src/components/ZoomControls.test.js
index 1b8efb89d2b00eb22248ffa8fd1b98bf31328df0..f76ce271def4ebff8b63e391ea890699f617882a 100644
--- a/__tests__/src/components/ZoomControls.test.js
+++ b/__tests__/src/components/ZoomControls.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import ZoomControls from '../../../src/components/ZoomControls';
+import { ZoomControls } from '../../../src/components/ZoomControls';
 
 describe('ZoomControls', () => {
   let wrapper;
diff --git a/src/components/App.js b/src/components/App.js
index 55bb715b5d4aafb9b5fe21425f75cddc50579792..41712e1e7e3316f44d072a5cdfaaa67e11218842 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -14,7 +14,7 @@ import i18n from '../i18n';
  * This is the top level Mirador component.
  * @prop {Object} manifests
  */
-class App extends Component {
+export class App extends Component {
   /** */
   constructor(props) {
     super(props);
@@ -96,6 +96,3 @@ App.defaultProps = {
   isFullscreenEnabled: false,
   isWorkspaceAddVisible: false,
 };
-
-
-export default App;
diff --git a/src/components/CanvasThumbnail.js b/src/components/CanvasThumbnail.js
index d60f95594be115934d99b9aac0222456c85294f6..833c4e128e7d3feae9b5fd70d973da59e87cc00b 100644
--- a/src/components/CanvasThumbnail.js
+++ b/src/components/CanvasThumbnail.js
@@ -6,7 +6,7 @@ import IntersectionObserver from '@researchgate/react-intersection-observer';
 /**
  * Uses InteractionObserver to "lazy" load canvas thumbnails that are in view.
  */
-export default class CanvasThumbnail extends Component {
+export class CanvasThumbnail extends Component {
   /**
    */
   constructor(props) {
diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 4e373821ae33017ae3e0aef6584713b03acf3b59..5ec80ef2d9e5a598a0e8bc1071bd6aded9918749 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -10,7 +10,7 @@ import WindowSideBarCanvasPanel from '../containers/WindowSideBarCanvasPanel';
 /**
  * CompanionWindow
  */
-class CompanionWindow extends Component {
+export class CompanionWindow extends Component {
   /**
    * activePanelComponent
    * @return React Component
@@ -74,5 +74,3 @@ CompanionWindow.defaultProps = {
   position: null,
   t: key => key,
 };
-
-export default CompanionWindow;
diff --git a/src/components/LabelValueMetadata.js b/src/components/LabelValueMetadata.js
index df1c26765a0ed6a24d2c14c1b67b2613072cd88b..cefe0a32b47bbef79b37254b52caad5c270dbd8e 100644
--- a/src/components/LabelValueMetadata.js
+++ b/src/components/LabelValueMetadata.js
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import SanitizedHtml from './SanitizedHtml';
+import { SanitizedHtml } from './SanitizedHtml';
 
 /**
  * Renders label/value pair metadata in a dl
  * @prop {object} labelValuePair
  */
-class LabelValueMetadata extends Component {
+export class LabelValueMetadata extends Component {
   /**
    * render
    * @return {String} - HTML markup for the component
@@ -41,5 +41,3 @@ class LabelValueMetadata extends Component {
 LabelValueMetadata.propTypes = {
   labelValuePairs: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types,
 };
-
-export default LabelValueMetadata;
diff --git a/src/components/LanguageSettings.js b/src/components/LanguageSettings.js
index ebe77d427f6a8803fec3b5e66a52635d4c034560..29efea8b74975e5143060d4ee13ffb3f57d8d4ff 100644
--- a/src/components/LanguageSettings.js
+++ b/src/components/LanguageSettings.js
@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
  * LanguageSettings ~ the workspace sub menu to change the language
  * of the application
 */
-export default class LanguageSettings extends Component {
+export class LanguageSettings extends Component {
   /**
    * Returns the rendered component
   */
diff --git a/src/components/ManifestForm.js b/src/components/ManifestForm.js
index 659f7eb553bc435addf1605de277ea708922ea5b..7aa210075b6b06c078e237855daadf4a841f88d6 100644
--- a/src/components/ManifestForm.js
+++ b/src/components/ManifestForm.js
@@ -8,7 +8,7 @@ import TextField from '@material-ui/core/TextField';
  * Provides a form for user input of a manifest url
  * @prop {Function} fetchManifest
  */
-class ManifestForm extends Component {
+export class ManifestForm extends Component {
   /**
    * constructor -
    */
@@ -95,5 +95,3 @@ ManifestForm.defaultProps = {
   t: key => key,
   onCancel: null,
 };
-
-export default ManifestForm;
diff --git a/src/components/ManifestListItem.js b/src/components/ManifestListItem.js
index d778cd556d50af16a210966d6a2da922f066551f..8ebcad834d121a3754dc3309234b304ce9a51bc7 100644
--- a/src/components/ManifestListItem.js
+++ b/src/components/ManifestListItem.js
@@ -24,7 +24,7 @@ const handleOpenButtonClick = (event, manifest, addWindow) => {
  */
 
 /** */
-class ManifestListItem extends React.Component {
+export class ManifestListItem extends React.Component {
   /** */
   componentDidMount() {
     const {
@@ -159,5 +159,3 @@ ManifestListItem.defaultProps = {
   error: null,
   isFetching: false,
 };
-
-export default ManifestListItem;
diff --git a/src/components/ManifestListItemError.js b/src/components/ManifestListItemError.js
index 24c1f419edfcf09510adab39ea6f9e2cc1a369a9..03842737051355c7366a61e47d7b53db71fad209 100644
--- a/src/components/ManifestListItemError.js
+++ b/src/components/ManifestListItemError.js
@@ -9,7 +9,7 @@ import Typography from '@material-ui/core/Typography';
  * ManifestListItemError renders a component displaying a
  * message to the user about a problem loading a manifest
 */
-class ManifestListItemError extends Component {
+export class ManifestListItemError extends Component {
   /**
    * Returns the rendered component
   */
@@ -59,5 +59,3 @@ ManifestListItemError.propTypes = {
   onTryAgainClick: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,
 };
-
-export default ManifestListItemError;
diff --git a/src/components/NestedMenu.js b/src/components/NestedMenu.js
index 1ced10fde4ff8c247a0746ee8b00d105599fff46..b576d629a36b747bf2b7ed08acd8c23a63941645 100644
--- a/src/components/NestedMenu.js
+++ b/src/components/NestedMenu.js
@@ -12,7 +12,7 @@ import ExpandMore from '@material-ui/icons/ExpandMoreSharp';
  * NestedMenu ~ A presentation component to render a menu item and have
  * it control the visibility of the MUI List passed in as the children
 */
-export default class NestedMenu extends Component {
+export class NestedMenu extends Component {
   /**
    * constructor -
    */
diff --git a/src/components/OpenSeadragonViewer.js b/src/components/OpenSeadragonViewer.js
index 0160ea131298af945909b0102653797eb11d032f..df58c9911fdc38cc7462a8b519b48bf299407e20 100644
--- a/src/components/OpenSeadragonViewer.js
+++ b/src/components/OpenSeadragonViewer.js
@@ -9,7 +9,7 @@ import ZoomControls from '../containers/ZoomControls';
  * Represents a OpenSeadragonViewer in the mirador workspace. Responsible for mounting
  * and rendering OSD.
  */
-class OpenSeadragonViewer extends Component {
+export class OpenSeadragonViewer extends Component {
   /**
    * @param {Object} props
    */
@@ -229,5 +229,3 @@ OpenSeadragonViewer.propTypes = {
   updateViewport: PropTypes.func.isRequired,
   windowId: PropTypes.string.isRequired,
 };
-
-export default OpenSeadragonViewer;
diff --git a/src/components/SanitizedHtml.js b/src/components/SanitizedHtml.js
index 299bf2eab8f6b93699e9ee2bac4a9b445f39ef5a..50ceb4ecf263ddde6ebcbe9c2715aa1269bdaf4a 100644
--- a/src/components/SanitizedHtml.js
+++ b/src/components/SanitizedHtml.js
@@ -6,7 +6,7 @@ import htmlRules from '../lib/htmlRules';
 
 /**
 */
-class SanitizedHtml extends Component {
+export class SanitizedHtml extends Component {
   /**
   */
   render() {
@@ -26,5 +26,3 @@ SanitizedHtml.propTypes = {
   ruleSet: PropTypes.string.isRequired,
   htmlString: PropTypes.string.isRequired,
 };
-
-export default SanitizedHtml;
diff --git a/src/components/ThumbnailNavigation.js b/src/components/ThumbnailNavigation.js
index 468d8da8114bbb3b7e481fc39a6a04d2e4a9661c..b79404d53926f62588a9ac732151838e2867959b 100644
--- a/src/components/ThumbnailNavigation.js
+++ b/src/components/ThumbnailNavigation.js
@@ -2,14 +2,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
 import Grid from 'react-virtualized/dist/commonjs/Grid';
-import CanvasThumbnail from './CanvasThumbnail';
+import { CanvasThumbnail } from './CanvasThumbnail';
 import ManifestoCanvas from '../lib/ManifestoCanvas';
 import ns from '../config/css-ns';
 import 'react-virtualized/styles.css';
 
 /**
  */
-class ThumbnailNavigation extends Component {
+export class ThumbnailNavigation extends Component {
   /**
    */
   constructor(props) {
@@ -153,5 +153,3 @@ ThumbnailNavigation.propTypes = {
   setCanvas: PropTypes.func.isRequired,
   window: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default ThumbnailNavigation;
diff --git a/src/components/ValidationCanvas.js b/src/components/ValidationCanvas.js
index 67cbfe8c804b5510347baff9e51a6f8d7fdfaa7f..dc3ed584ef790770d9f7887f516fa0abddad129c 100644
--- a/src/components/ValidationCanvas.js
+++ b/src/components/ValidationCanvas.js
@@ -2,7 +2,7 @@ import ManifestoCanvas from '../lib/ManifestoCanvas';
 
 /**
  */
-export default class ValidationCanvas extends ManifestoCanvas {
+export class ValidationCanvas extends ManifestoCanvas {
   /**
    * checks whether the canvas has a valid height
    */
diff --git a/src/components/ViewerNavigation.js b/src/components/ViewerNavigation.js
index 45bf4e7207c946aa3d2558b91e4af3bee8a74f3e..3d5ed7a0669aa29267825bbadbcb63164fcb10db 100644
--- a/src/components/ViewerNavigation.js
+++ b/src/components/ViewerNavigation.js
@@ -7,7 +7,7 @@ import ns from '../config/css-ns';
 
 /**
  */
-class ViewerNavigation extends Component {
+export class ViewerNavigation extends Component {
   /**
    */
   constructor(props) {
@@ -76,5 +76,3 @@ ViewerNavigation.propTypes = {
   previousCanvas: PropTypes.func.isRequired,
   window: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default ViewerNavigation;
diff --git a/src/components/Window.js b/src/components/Window.js
index af4819da86836a54b968a875165896185eb75920..d22e44b5bb7b5e41db47568792ea54f823373db9 100644
--- a/src/components/Window.js
+++ b/src/components/Window.js
@@ -9,7 +9,7 @@ import ThumbnailNavigation from '../containers/ThumbnailNavigation';
  * Represents a Window in the mirador workspace
  * @param {object} window
  */
-class Window extends Component {
+export class Window extends Component {
   /**
    * Renders things
    */
@@ -48,5 +48,3 @@ Window.defaultProps = {
   window: null,
   manifest: null,
 };
-
-export default Window;
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
index 99d5c8fc7421105972a2b5b49f8ae36c897503b1..921b11c3a3e8412fd0b15413edd10fa8544db36d 100644
--- a/src/components/WindowList.js
+++ b/src/components/WindowList.js
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 
 /**
  */
-class WindowList extends Component {
+export class WindowList extends Component {
   /**
    * Get the title for a window from its manifest title
    * @private
@@ -67,5 +67,3 @@ WindowList.defaultProps = {
   anchorEl: null,
   t: key => key,
 };
-
-export default WindowList;
diff --git a/src/components/WindowMiddleContent.js b/src/components/WindowMiddleContent.js
index b2817e6b68d508c5898c51b06e0fcde6ea68fc3d..aae3cc7895459f5688399f3f4b1456d75163056c 100644
--- a/src/components/WindowMiddleContent.js
+++ b/src/components/WindowMiddleContent.js
@@ -9,7 +9,7 @@ import ns from '../config/css-ns';
  * WindowMiddleContent - component that renders the "middle" area of the
  * Mirador Window
  */
-class WindowMiddleContent extends Component {
+export class WindowMiddleContent extends Component {
   /**
    * renderViewer
    *
@@ -52,5 +52,3 @@ WindowMiddleContent.propTypes = {
 WindowMiddleContent.defaultProps = {
   manifest: null,
 };
-
-export default WindowMiddleContent;
diff --git a/src/components/WindowSideBar.js b/src/components/WindowSideBar.js
index 77dba007cf070c57f0e64eb162b598c4017ce648..0ada1def27b656effdd956fe6eedd14ecf457d3d 100644
--- a/src/components/WindowSideBar.js
+++ b/src/components/WindowSideBar.js
@@ -10,7 +10,7 @@ import ns from '../config/css-ns';
 /**
  * WindowSideBar
  */
-class WindowSideBar extends Component {
+export class WindowSideBar extends Component {
   /**
    * render
    * @return
@@ -72,5 +72,3 @@ WindowSideBar.defaultProps = {
   sideBarOpen: false,
   sideBarPanel: 'closed',
 };
-
-export default WindowSideBar;
diff --git a/src/components/WindowSideBarButtons.js b/src/components/WindowSideBarButtons.js
index 949a468a4d47f01b318aa018b44f6cc94e45cd6e..80ba4886cf152a36fefcc47b5af38c76d8fa4958 100644
--- a/src/components/WindowSideBarButtons.js
+++ b/src/components/WindowSideBarButtons.js
@@ -7,7 +7,7 @@ import ListIcon from '@material-ui/icons/FormatAlignJustify';
 /**
  *
  */
-class WindowSideBarButtons extends Component {
+export class WindowSideBarButtons extends Component {
   /**
    * sideBarPanelCurrentlySelected - return if the given sideBarPanel is currently selected
    * @return Boolean
@@ -67,5 +67,3 @@ WindowSideBarButtons.defaultProps = {
   sideBarPanel: 'closed',
   t: key => key,
 };
-
-export default WindowSideBarButtons;
diff --git a/src/components/WindowSideBarCanvasPanel.js b/src/components/WindowSideBarCanvasPanel.js
index b777144800153c5e9f6bf8097422711d8330450c..2575b83fbb0a715111b3d4d4fbf4cd67cafc0082 100644
--- a/src/components/WindowSideBarCanvasPanel.js
+++ b/src/components/WindowSideBarCanvasPanel.js
@@ -4,14 +4,14 @@ import classNames from 'classnames';
 import Typography from '@material-ui/core/Typography';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
-import ValidationCanvas from './ValidationCanvas';
-import CanvasThumbnail from './CanvasThumbnail';
+import { CanvasThumbnail } from './CanvasThumbnail';
+import { ValidationCanvas } from './ValidationCanvas';
 import { getIdAndLabelOfCanvases } from '../state/selectors';
 
 /**
  * a panel showing the canvases for a given manifest
  */
-class WindowSideBarCanvasPanel extends Component {
+export class WindowSideBarCanvasPanel extends Component {
   /**
    * calculateScaledWidth - calculates the scaled width according to the given width and aspectRatio
    */
@@ -81,5 +81,3 @@ WindowSideBarCanvasPanel.propTypes = {
   t: PropTypes.func.isRequired,
   windowId: PropTypes.string.isRequired,
 };
-
-export default WindowSideBarCanvasPanel;
diff --git a/src/components/WindowSideBarInfoPanel.js b/src/components/WindowSideBarInfoPanel.js
index e767d2648c42bac4046ebe568b2f8d7ba5fe7e6d..bcf3a89a7c14e980f3d1eb47fef7a199658b42c7 100644
--- a/src/components/WindowSideBarInfoPanel.js
+++ b/src/components/WindowSideBarInfoPanel.js
@@ -2,15 +2,15 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Divider from '@material-ui/core/Divider';
 import Typography from '@material-ui/core/Typography';
-import LabelValueMetadata from './LabelValueMetadata';
-import SanitizedHtml from './SanitizedHtml';
+import { SanitizedHtml } from './SanitizedHtml';
+import { LabelValueMetadata } from './LabelValueMetadata';
 import ns from '../config/css-ns';
 
 
 /**
  * WindowSideBarInfoPanel
  */
-class WindowSideBarInfoPanel extends Component {
+export class WindowSideBarInfoPanel extends Component {
   /**
    * render
    * @return
@@ -98,5 +98,3 @@ WindowSideBarInfoPanel.defaultProps = {
   manifestMetadata: [],
   t: key => key,
 };
-
-export default WindowSideBarInfoPanel;
diff --git a/src/components/WindowSideBarPanel.js b/src/components/WindowSideBarPanel.js
index 16d45c4110b27ae55faf8be2e1efb51b67c13516..659e484d683f51ccdc55a9c6f59f8e552e219fb9 100644
--- a/src/components/WindowSideBarPanel.js
+++ b/src/components/WindowSideBarPanel.js
@@ -9,7 +9,7 @@ import WindowSideBarCanvasPanel from '../containers/WindowSideBarCanvasPanel';
  * WindowSideBarPanel - the panel that pops out from the sidebar
  * when various icons are clicked such as Info, Search, etc.
  */
-class WindowSideBarPanel extends Component {
+export class WindowSideBarPanel extends Component {
   /**
    * activePanelComponent
    * @return React Component
@@ -60,5 +60,3 @@ WindowSideBarPanel.defaultProps = {
   sideBarPanel: 'closed', // Closed will fall out to the default null case for the actiuve panel
   t: key => key,
 };
-
-export default WindowSideBarPanel;
diff --git a/src/components/WindowThumbnailSettings.js b/src/components/WindowThumbnailSettings.js
index 518a74cd2884f1a5ac42dab26ae0ec4ddcaff2fc..7f2a84520c948d8e1c628b904238e0b245ef02e9 100644
--- a/src/components/WindowThumbnailSettings.js
+++ b/src/components/WindowThumbnailSettings.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 /**
  *
  */
-export default class WindowThumbnailSettings extends Component {
+export class WindowThumbnailSettings extends Component {
   /**
    * constructor -
    */
diff --git a/src/components/WindowTopBar.js b/src/components/WindowTopBar.js
index 61d1942c044130124d0f203ac9f135ade34733ab..bab19df9f06ca0bd8854787d3d4e20ff4948d7e0 100644
--- a/src/components/WindowTopBar.js
+++ b/src/components/WindowTopBar.js
@@ -16,7 +16,7 @@ import ns from '../config/css-ns';
 /**
  * WindowTopBar
  */
-class WindowTopBar extends Component {
+export class WindowTopBar extends Component {
   /**
    * render
    * @return
@@ -68,5 +68,3 @@ WindowTopBar.defaultProps = {
   manifestTitle: '',
   t: key => key,
 };
-
-export default WindowTopBar;
diff --git a/src/components/WindowTopBarButtons.js b/src/components/WindowTopBarButtons.js
index 26f90a522f9f2d45b0841fc6e0707fc77bba1394..d9ee5ef960434a2f713b018513987c0f181b2742 100644
--- a/src/components/WindowTopBarButtons.js
+++ b/src/components/WindowTopBarButtons.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 /**
  *
  */
-class WindowTopBarButtons extends Component {
+export class WindowTopBarButtons extends Component {
   /**
    * render
    *
@@ -13,5 +13,3 @@ class WindowTopBarButtons extends Component {
     return (<></>);
   }
 }
-
-export default WindowTopBarButtons;
diff --git a/src/components/WindowTopMenu.js b/src/components/WindowTopMenu.js
index b5d5b9f7d34200118ba6c25f546b339a48055751..d19e3c14cca253962ec161a7836fccfae8bed008 100644
--- a/src/components/WindowTopMenu.js
+++ b/src/components/WindowTopMenu.js
@@ -8,7 +8,7 @@ import WindowViewSettings from '../containers/WindowViewSettings';
 
 /**
  */
-class WindowTopMenu extends Component {
+export class WindowTopMenu extends Component {
   /**
    * render
    * @return
@@ -43,5 +43,3 @@ WindowTopMenu.propTypes = {
 WindowTopMenu.defaultProps = {
   anchorEl: null,
 };
-
-export default WindowTopMenu;
diff --git a/src/components/WindowTopMenuButton.js b/src/components/WindowTopMenuButton.js
index bbef7d0002d0cb18a2ccbf42d7bbf5d7cf1b2fac..4af5dc32d779556fab6feb42cc85decce7790166 100644
--- a/src/components/WindowTopMenuButton.js
+++ b/src/components/WindowTopMenuButton.js
@@ -6,7 +6,7 @@ import WindowTopMenu from '../containers/WindowTopMenu';
 
 /**
  */
-class WindowTopMenuButton extends Component {
+export class WindowTopMenuButton extends Component {
   /**
    * constructor -
    */
@@ -76,5 +76,3 @@ WindowTopMenuButton.propTypes = {
 WindowTopMenuButton.defaultProps = {
   t: key => key,
 };
-
-export default WindowTopMenuButton;
diff --git a/src/components/WindowViewSettings.js b/src/components/WindowViewSettings.js
index c3f5faa0ea8ff5ab38c71e2778a65b0f20e307cf..61f5d899e84095f7b0259673bab703563bcfae63 100644
--- a/src/components/WindowViewSettings.js
+++ b/src/components/WindowViewSettings.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 /**
  *
  */
-export default class WindowViewSettings extends Component {
+export class WindowViewSettings extends Component {
   /**
    * constructor -
    */
diff --git a/src/components/WindowViewer.js b/src/components/WindowViewer.js
index b833a101f80a7816e4c388f049388036a91b07a8..4ecbb8f58ef95791c99a0ca49a85779377cc46bc 100644
--- a/src/components/WindowViewer.js
+++ b/src/components/WindowViewer.js
@@ -9,7 +9,7 @@ import CanvasGroupings from '../lib/CanvasGroupings';
  * Represents a WindowViewer in the mirador workspace. Responsible for mounting
  * OSD and Navigation
  */
-class WindowViewer extends Component {
+export class WindowViewer extends Component {
   /**
    * @param {Object} props
    */
@@ -127,5 +127,3 @@ WindowViewer.propTypes = {
   manifest: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   window: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default WindowViewer;
diff --git a/src/components/Workspace.js b/src/components/Workspace.js
index 72613eab60a95424c0cf1457b2f8a48bbe38bbbf..8de5b49767c52ee79eb5a3997dd393bac49b0b44 100644
--- a/src/components/Workspace.js
+++ b/src/components/Workspace.js
@@ -10,7 +10,7 @@ import ns from '../config/css-ns';
  * @memberof Workspace
  * @private
  */
-class Workspace extends React.Component {
+export class Workspace extends React.Component {
   /**
    * Determine which workspace to render by configured type
    */
@@ -55,5 +55,3 @@ Workspace.propTypes = {
   windows: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   workspaceType: PropTypes.string.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default Workspace;
diff --git a/src/components/WorkspaceAdd.js b/src/components/WorkspaceAdd.js
index 256581132f4c91851edfc443f4f5784d2e250370..8be99d0023d2c89461e0403a4a93cd242a4ea44f 100644
--- a/src/components/WorkspaceAdd.js
+++ b/src/components/WorkspaceAdd.js
@@ -18,7 +18,7 @@ import ManifestListItem from '../containers/ManifestListItem';
  * @memberof Workspace
  * @private
  */
-class WorkspaceAdd extends React.Component {
+export class WorkspaceAdd extends React.Component {
   /** */
   constructor(props) {
     super(props);
@@ -104,5 +104,3 @@ WorkspaceAdd.defaultProps = {
   classes: {},
   t: key => key,
 };
-
-export default WorkspaceAdd;
diff --git a/src/components/WorkspaceAddButton.js b/src/components/WorkspaceAddButton.js
index 027326832c2aee1aa124a39918b54079c56a2c42..12dd32b8646b866609e45343f87cd10b2674fd28 100644
--- a/src/components/WorkspaceAddButton.js
+++ b/src/components/WorkspaceAddButton.js
@@ -7,7 +7,7 @@ import ClearIcon from '@material-ui/icons/Clear';
 
 /**
  */
-class WorkspaceAddButton extends Component {
+export class WorkspaceAddButton extends Component {
   /**
    * render
    * @return
@@ -47,5 +47,3 @@ WorkspaceAddButton.defaultProps = {
   t: key => key,
   isWorkspaceAddVisible: false,
 };
-
-export default WorkspaceAddButton;
diff --git a/src/components/WorkspaceControlPanel.js b/src/components/WorkspaceControlPanel.js
index 59a89b7d8efac49bab5159240d9b87bff2274603..86c86273bb451faafac5f9cdfbd76d90ef258703 100644
--- a/src/components/WorkspaceControlPanel.js
+++ b/src/components/WorkspaceControlPanel.js
@@ -9,7 +9,7 @@ import ns from '../config/css-ns';
 /**
  * Provides the panel responsible for controlling the entire workspace
  */
-class WorkspaceControlPanel extends Component {
+export class WorkspaceControlPanel extends Component {
   /**
    * render
    * @return {String} - HTML markup for the component
@@ -34,5 +34,3 @@ class WorkspaceControlPanel extends Component {
 WorkspaceControlPanel.propTypes = {
   classes: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default WorkspaceControlPanel;
diff --git a/src/components/WorkspaceControlPanelButtons.js b/src/components/WorkspaceControlPanelButtons.js
index a9f75a68f0864bab7aa1df954c3483037010a902..4290b3cd2fb6c5a14aae874c481538d5e148b513 100644
--- a/src/components/WorkspaceControlPanelButtons.js
+++ b/src/components/WorkspaceControlPanelButtons.js
@@ -8,7 +8,7 @@ import WorkspaceMenuButton from '../containers/WorkspaceMenuButton';
 /**
  *
  */
-class WorkspaceControlPanelButtons extends Component {
+export class WorkspaceControlPanelButtons extends Component {
   /**
    * render
    *
@@ -34,5 +34,3 @@ WorkspaceControlPanelButtons.propTypes = {
 WorkspaceControlPanelButtons.defaultProps = {
   children: null,
 };
-
-export default WorkspaceControlPanelButtons;
diff --git a/src/components/WorkspaceExport.js b/src/components/WorkspaceExport.js
index 9407576c5ca1259923c6089c231f28251a8345be..047f77d460bd47c3897323b3eafa6764dadd9910 100644
--- a/src/components/WorkspaceExport.js
+++ b/src/components/WorkspaceExport.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 
 /**
  */
-class WorkspaceExport extends Component {
+export class WorkspaceExport extends Component {
   /**
    * @private
    */
@@ -55,5 +55,3 @@ WorkspaceExport.defaultProps = {
   children: null,
   t: key => key,
 };
-
-export default WorkspaceExport;
diff --git a/src/components/WorkspaceFullScreenButton.js b/src/components/WorkspaceFullScreenButton.js
index 66867963de9f2899b96dd113c83d71ad621f1214..008de38d39e18b8ef8a1ebd88f090c23a8a74ca2 100644
--- a/src/components/WorkspaceFullScreenButton.js
+++ b/src/components/WorkspaceFullScreenButton.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 
 /**
  */
-class WorkspaceFullScreenButton extends Component {
+export class WorkspaceFullScreenButton extends Component {
   /**
    * render
    * @return
@@ -32,5 +32,3 @@ WorkspaceFullScreenButton.propTypes = {
 WorkspaceFullScreenButton.defaultProps = {
   t: key => key,
 };
-
-export default WorkspaceFullScreenButton;
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
index facbe4fbd247422b43d7a8d88acfed61df7f3456..361a213379a5ea4e7dad0e8af79cc677bb79a731 100644
--- a/src/components/WorkspaceMenu.js
+++ b/src/components/WorkspaceMenu.js
@@ -11,14 +11,14 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import ViewHeadlineIcon from '@material-ui/icons/ViewHeadline';
 import PropTypes from 'prop-types';
 import LanguageSettings from '../containers/LanguageSettings';
-import NestedMenu from './NestedMenu';
+import { NestedMenu } from './NestedMenu';
 import WindowList from '../containers/WindowList';
 import WorkspaceSettings from '../containers/WorkspaceSettings';
 import WorkspaceExport from '../containers/WorkspaceExport';
 
 /**
  */
-class WorkspaceMenu extends Component {
+export class WorkspaceMenu extends Component {
   /**
    * constructor -
    */
@@ -171,5 +171,3 @@ WorkspaceMenu.defaultProps = {
   showZoomControls: false,
   toggleZoomControls: () => {},
 };
-
-export default WorkspaceMenu;
diff --git a/src/components/WorkspaceMenuButton.js b/src/components/WorkspaceMenuButton.js
index 3daaa8970027975743f22f36a4c313f4000fcdce..43948b5170a07563cd17558588d29c24b24971c0 100644
--- a/src/components/WorkspaceMenuButton.js
+++ b/src/components/WorkspaceMenuButton.js
@@ -7,7 +7,7 @@ import WorkspaceMenu from '../containers/WorkspaceMenu';
 
 /**
  */
-class WorkspaceMenuButton extends Component {
+export class WorkspaceMenuButton extends Component {
   /**
    * constructor -
    */
@@ -78,5 +78,3 @@ WorkspaceMenuButton.propTypes = {
 WorkspaceMenuButton.defaultProps = {
   t: key => key,
 };
-
-export default WorkspaceMenuButton;
diff --git a/src/components/WorkspaceMosaic.js b/src/components/WorkspaceMosaic.js
index 15006a5ee7a9e5fba0dad6250fc1176c9ec63ff8..629081a2cfbc29f794c069ed448b10d47f4343da 100644
--- a/src/components/WorkspaceMosaic.js
+++ b/src/components/WorkspaceMosaic.js
@@ -11,7 +11,7 @@ import Window from '../containers/Window';
  * @memberof Workspace
  * @private
  */
-class WorkspaceMosaic extends React.Component {
+export class WorkspaceMosaic extends React.Component {
   /**
    */
   constructor(props) {
@@ -100,11 +100,8 @@ class WorkspaceMosaic extends React.Component {
   }
 }
 
-
 WorkspaceMosaic.propTypes = {
   updateWorkspaceMosaicLayout: PropTypes.func.isRequired,
   windows: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   workspace: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
 };
-
-export default WorkspaceMosaic;
diff --git a/src/components/WorkspaceSettings.js b/src/components/WorkspaceSettings.js
index 9254367653b555644d196dd2323ebc148bc1eed3..f3d4dfc32ec2f1b75d133c6495d4fa352e53cb30 100644
--- a/src/components/WorkspaceSettings.js
+++ b/src/components/WorkspaceSettings.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 
 /**
  */
-class WorkspaceSettings extends Component {
+export class WorkspaceSettings extends Component {
   /**
    * constructor -
    */
@@ -81,5 +81,3 @@ WorkspaceSettings.defaultProps = {
   children: null,
   t: key => key,
 };
-
-export default WorkspaceSettings;
diff --git a/src/components/ZoomControls.js b/src/components/ZoomControls.js
index 1896c60ac37ab8932aaf357c777e7cecd906345e..b50db069448a6bf17f1e94669743aaed89f07379 100644
--- a/src/components/ZoomControls.js
+++ b/src/components/ZoomControls.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 
 /**
  */
-class ZoomControls extends Component {
+export class ZoomControls extends Component {
   /**
    * constructor -
    */
@@ -115,5 +115,3 @@ ZoomControls.defaultProps = {
   updateViewport: () => {},
   t: key => key,
 };
-
-export default ZoomControls;
diff --git a/src/components/index.js b/src/components/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e624b5872b0f962af411342fe7ee3d2ecc50a4cb
--- /dev/null
+++ b/src/components/index.js
@@ -0,0 +1,41 @@
+export * from './App';
+export * from './CanvasThumbnail';
+export * from './CompanionWindow';
+export * from './LabelValueMetadata';
+export * from './LanguageSettings';
+export * from './ManifestForm';
+export * from './ManifestListItem';
+export * from './ManifestListItemError';
+export * from './NestedMenu';
+export * from './OpenSeadragonViewer';
+export * from './SanitizedHtml';
+export * from './ThumbnailNavigation';
+export * from './ValidationCanvas';
+export * from './ViewerNavigation';
+export * from './Window';
+export * from './WindowList';
+export * from './WindowMiddleContent';
+export * from './WindowSideBar';
+export * from './WindowSideBarButtons';
+export * from './WindowSideBarCanvasPanel';
+export * from './WindowSideBarInfoPanel';
+export * from './WindowSideBarPanel';
+export * from './WindowThumbnailSettings';
+export * from './WindowTopBar';
+export * from './WindowTopBarButtons';
+export * from './WindowTopMenu';
+export * from './WindowTopMenuButton';
+export * from './WindowViewer';
+export * from './WindowViewSettings';
+export * from './Workspace';
+export * from './WorkspaceAdd';
+export * from './WorkspaceAddButton';
+export * from './WorkspaceControlPanel';
+export * from './WorkspaceControlPanelButtons';
+export * from './WorkspaceExport';
+export * from './WorkspaceFullScreenButton';
+export * from './WorkspaceMenu';
+export * from './WorkspaceMenuButton';
+export * from './WorkspaceMosaic';
+export * from './WorkspaceSettings';
+export * from './ZoomControls';
diff --git a/src/containers/App.js b/src/containers/App.js
index 8136706c3b6ca75be63d7fd6468645a351e12abf..a5afdb705cae1ebc29cb1d82292b6966bb9522f2 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withStyles } from '@material-ui/core/styles';
 import * as actions from '../state/actions';
-import App from '../components/App';
+import { App } from '../components/App';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/CompanionWindow.js b/src/containers/CompanionWindow.js
index 6f67db4c4f75133b708b971a140e6599ccb8131a..8966ab3a93a5bbb50d374df8d5236a24ed6b441f 100644
--- a/src/containers/CompanionWindow.js
+++ b/src/containers/CompanionWindow.js
@@ -4,7 +4,7 @@ import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import CompanionWindow from '../components/CompanionWindow';
+import { CompanionWindow } from '../components/CompanionWindow';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/LanguageSettings.js b/src/containers/LanguageSettings.js
index ffd9c2147e607ed7aa7cc45a69a43ac734d4ea7d..380aa2c205db438d5c770fccd994c6a21ba15896 100644
--- a/src/containers/LanguageSettings.js
+++ b/src/containers/LanguageSettings.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import * as actions from '../state/actions';
 import { getLanguagesFromConfigWithCurrent } from '../state/selectors';
-import LanguageSettings from '../components/LanguageSettings';
+import { LanguageSettings } from '../components/LanguageSettings';
 
 /**
  * Map state to props for connect
diff --git a/src/containers/ManifestForm.js b/src/containers/ManifestForm.js
index f8c68e390119803e07007606ab2ca76617afa774..d3fb3d94bb86efb9b38b2eab06f40feb0284c1ff 100644
--- a/src/containers/ManifestForm.js
+++ b/src/containers/ManifestForm.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withNamespaces } from 'react-i18next';
 import * as actions from '../state/actions';
-import ManifestForm from '../components/ManifestForm';
+import { ManifestForm } from '../components/ManifestForm';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/ManifestListItem.js b/src/containers/ManifestListItem.js
index da4d5bfd9ce60b8b4b88b5f22eb43ba2c989d62d..f8c032e9435f4a1d2e10b08e0760ae0fceaef7d0 100644
--- a/src/containers/ManifestListItem.js
+++ b/src/containers/ManifestListItem.js
@@ -6,7 +6,7 @@ import {
   getManifestTitle, getManifestLogo, getManifestThumbnail, getManifestCanvases, getManifestProvider,
 } from '../state/selectors';
 import * as actions from '../state/actions';
-import ManifestListItem from '../components/ManifestListItem';
+import { ManifestListItem } from '../components/ManifestListItem';
 
 /** */
 const mapStateToProps = (state, { manifestId }) => {
diff --git a/src/containers/ManifestListItemError.js b/src/containers/ManifestListItemError.js
index 5aa930fd4bf4f4029f32c54b9394509f0b055a08..10f4eac5fcb0705d8e1a21b51f0180a65ebbbe0a 100644
--- a/src/containers/ManifestListItemError.js
+++ b/src/containers/ManifestListItemError.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core/styles';
 import { fetchManifest, removeManifest } from '../state/actions/manifest';
-import ManifestListItemError from '../components/ManifestListItemError';
+import { ManifestListItemError } from '../components/ManifestListItemError';
 
 /** */
 const mapDispatchToProps = {
diff --git a/src/containers/OpenSeadragonViewer.js b/src/containers/OpenSeadragonViewer.js
index 11aaad06acc2550870233e4f6abb6021615c439b..bb1242dadf6f8be533b4f32b7eccad43cbf85e8a 100644
--- a/src/containers/OpenSeadragonViewer.js
+++ b/src/containers/OpenSeadragonViewer.js
@@ -1,7 +1,7 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import OpenSeadragonViewer from '../components/OpenSeadragonViewer';
+import { OpenSeadragonViewer } from '../components/OpenSeadragonViewer';
 import * as actions from '../state/actions';
 
 /**
diff --git a/src/containers/ThumbnailNavigation.js b/src/containers/ThumbnailNavigation.js
index d0e33828d6f268dffd4363b66835f0df73212bff..da94c42630120f2689876ac9a610afe055018a46 100644
--- a/src/containers/ThumbnailNavigation.js
+++ b/src/containers/ThumbnailNavigation.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import CanvasGroupings from '../lib/CanvasGroupings';
 import * as actions from '../state/actions';
-import ThumbnailNavigation from '../components/ThumbnailNavigation';
+import { ThumbnailNavigation } from '../components/ThumbnailNavigation';
 import { getManifestCanvases } from '../state/selectors';
 /**
  * mapStateToProps - used to hook up state to props
diff --git a/src/containers/ViewerNavigation.js b/src/containers/ViewerNavigation.js
index 88eef70adc191bc5f9d97a7298016bb1293f0a6a..82d63b9243e649e16d5cb50d1a2d4fdd0fe82eb3 100644
--- a/src/containers/ViewerNavigation.js
+++ b/src/containers/ViewerNavigation.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import * as actions from '../state/actions';
-import ViewerNavigation from '../components/ViewerNavigation';
+import { ViewerNavigation } from '../components/ViewerNavigation';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/Window.js b/src/containers/Window.js
index 1532051f8aaec48f74001fe920697c10852aca77..c0cbb4c5328fefd38855e9c38b7578ea13f7a532 100644
--- a/src/containers/Window.js
+++ b/src/containers/Window.js
@@ -1,6 +1,6 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import Window from '../components/Window';
+import { Window } from '../components/Window';
 
 /**
  * mapStateToProps - used to hook up connect to action creators
@@ -14,7 +14,6 @@ const mapStateToProps = ({ manifests, windows }, props) => ({
 
 const enhance = compose(
   connect(mapStateToProps),
-  // further HOC go here
 );
 
 export default enhance(Window);
diff --git a/src/containers/WindowList.js b/src/containers/WindowList.js
index 4679a79c708982754358d8daeaf038f7140682ce..7c9a713d1841e40070f31dfa19ac1472d18d9436 100644
--- a/src/containers/WindowList.js
+++ b/src/containers/WindowList.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withNamespaces } from 'react-i18next';
 import * as actions from '../state/actions';
-import WindowList from '../components/WindowList';
+import { WindowList } from '../components/WindowList';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/WindowMiddleContent.js b/src/containers/WindowMiddleContent.js
index 9ca434593329cc514e680d4a05b0be79b0fc5860..2165d5aecd6c0366f146b3a12f20b661123c31a9 100644
--- a/src/containers/WindowMiddleContent.js
+++ b/src/containers/WindowMiddleContent.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { getCompantionWindowIds } from '../state/selectors';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowMiddleContent from '../components/WindowMiddleContent';
+import { WindowMiddleContent } from '../components/WindowMiddleContent';
 
 /** */
 const mapStateToProps = (state, { window }) => ({
diff --git a/src/containers/WindowSideBar.js b/src/containers/WindowSideBar.js
index ab74ea2930a70e876dc55facf68048dbe476844d..1a1731d5da2e04e9d4444b4f981d620482b1bd42 100644
--- a/src/containers/WindowSideBar.js
+++ b/src/containers/WindowSideBar.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withStyles } from '@material-ui/core';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowSideBar from '../components/WindowSideBar';
+import { WindowSideBar } from '../components/WindowSideBar';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WindowSideBarButtons.js b/src/containers/WindowSideBarButtons.js
index 6347829f033ab9f48d69551455556e6f024d69db..71c63bfb87648da10fd05ccf1afa5315a6b8545f 100644
--- a/src/containers/WindowSideBarButtons.js
+++ b/src/containers/WindowSideBarButtons.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowSideBarButtons from '../components/WindowSideBarButtons';
+import { WindowSideBarButtons } from '../components/WindowSideBarButtons';
 
 
 /**
diff --git a/src/containers/WindowSideBarCanvasPanel.js b/src/containers/WindowSideBarCanvasPanel.js
index dddabb541f1503c61eb3f6ef8db484113458a730..f0a10b4f2f73d01f115fe42f49ecc8baa7609d9f 100644
--- a/src/containers/WindowSideBarCanvasPanel.js
+++ b/src/containers/WindowSideBarCanvasPanel.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core/styles';
 import * as actions from '../state/actions';
-import WindowSideBarCanvasPanel from '../components/WindowSideBarCanvasPanel';
+import { WindowSideBarCanvasPanel } from '../components/WindowSideBarCanvasPanel';
 import {
   getManifestCanvases,
   getWindowManifest,
diff --git a/src/containers/WindowSideBarInfoPanel.js b/src/containers/WindowSideBarInfoPanel.js
index 13b272b5fd430a89a1989abc17d9a20050a72cd8..8ada2260825180e31be3d2fcee1eb1aa7aa5dfc9 100644
--- a/src/containers/WindowSideBarInfoPanel.js
+++ b/src/containers/WindowSideBarInfoPanel.js
@@ -12,7 +12,7 @@ import {
   getWindowManifest,
   getCanvasDescription,
 } from '../state/selectors';
-import WindowSideBarInfoPanel from '../components/WindowSideBarInfoPanel';
+import { WindowSideBarInfoPanel } from '../components/WindowSideBarInfoPanel';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WindowSideBarPanel.js b/src/containers/WindowSideBarPanel.js
index 8773ac5ae23e1d71483b36420fde2f96625b1a88..6f959bb0484caea2175007b522d1865c17dbfe05 100644
--- a/src/containers/WindowSideBarPanel.js
+++ b/src/containers/WindowSideBarPanel.js
@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { withNamespaces } from 'react-i18next';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowSideBarPanel from '../components/WindowSideBarPanel';
+import { WindowSideBarPanel } from '../components/WindowSideBarPanel';
 
 /** */
 const mapDispatchToProps = {
diff --git a/src/containers/WindowThumbnailSettings.js b/src/containers/WindowThumbnailSettings.js
index 2f721a632953bc682695c05edcf1d9efc5f0d2b4..27c7b5facadbe51d7fc658ace487132daedc17ba 100644
--- a/src/containers/WindowThumbnailSettings.js
+++ b/src/containers/WindowThumbnailSettings.js
@@ -4,7 +4,7 @@ import { withNamespaces } from 'react-i18next';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import * as actions from '../state/actions';
 import { getThumbnailNavigationPosition } from '../state/selectors';
-import WindowThumbnailSettings from '../components/WindowThumbnailSettings';
+import { WindowThumbnailSettings } from '../components/WindowThumbnailSettings';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/WindowTopBar.js b/src/containers/WindowTopBar.js
index 245fca7d17299f4e4197db15b43ee2fbaa608a0c..26c912aea4274dc48190d1accc24009007cb7b37 100644
--- a/src/containers/WindowTopBar.js
+++ b/src/containers/WindowTopBar.js
@@ -5,7 +5,7 @@ import { withStyles } from '@material-ui/core';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import { getWindowManifest, getManifestTitle } from '../state/selectors';
-import WindowTopBar from '../components/WindowTopBar';
+import { WindowTopBar } from '../components/WindowTopBar';
 
 /** mapStateToProps */
 const mapStateToProps = (state, { windowId }) => ({
diff --git a/src/containers/WindowTopBarButtons.js b/src/containers/WindowTopBarButtons.js
index dd169b0dc40e30efe90948966480f7cc23f06001..fe70d52ef23f120a3ff42c8447770bf66196ea9e 100644
--- a/src/containers/WindowTopBarButtons.js
+++ b/src/containers/WindowTopBarButtons.js
@@ -1,4 +1,4 @@
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowTopBarButtons from '../components/WindowTopBarButtons';
+import { WindowTopBarButtons } from '../components/WindowTopBarButtons';
 
 export default miradorWithPlugins(WindowTopBarButtons);
diff --git a/src/containers/WindowTopMenu.js b/src/containers/WindowTopMenu.js
index cd163f2f530e6929e8cb3b268f4b2e7bc56cb4ae..5cfba2887e4ee44f848429260101323e6c4beb60 100644
--- a/src/containers/WindowTopMenu.js
+++ b/src/containers/WindowTopMenu.js
@@ -1,4 +1,4 @@
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowTopMenu from '../components/WindowTopMenu';
+import { WindowTopMenu } from '../components/WindowTopMenu';
 
 export default miradorWithPlugins(WindowTopMenu);
diff --git a/src/containers/WindowTopMenuButton.js b/src/containers/WindowTopMenuButton.js
index c3ea20eca68161339f6342fd2ae198321dc07a65..331c842a113fff13902ce4348c5c98ecf537bd09 100644
--- a/src/containers/WindowTopMenuButton.js
+++ b/src/containers/WindowTopMenuButton.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowTopMenuButton from '../components/WindowTopMenuButton';
+import { WindowTopMenuButton } from '../components/WindowTopMenuButton';
 
 /**
  *
diff --git a/src/containers/WindowViewSettings.js b/src/containers/WindowViewSettings.js
index b7e709397d94ba4157f0620864388805546342e3..dc7be5f8394ec2f0c3d0a39e57ba8adf8995f5d8 100644
--- a/src/containers/WindowViewSettings.js
+++ b/src/containers/WindowViewSettings.js
@@ -4,7 +4,7 @@ import { withNamespaces } from 'react-i18next';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import * as actions from '../state/actions';
 import { getWindowViewType } from '../state/selectors';
-import WindowViewSettings from '../components/WindowViewSettings';
+import { WindowViewSettings } from '../components/WindowViewSettings';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/WindowViewer.js b/src/containers/WindowViewer.js
index 037e6e2fd266487a6f41fd5a3df330a096d551e9..61f185edf540d062490a701ae719bf0e0c34a943 100644
--- a/src/containers/WindowViewer.js
+++ b/src/containers/WindowViewer.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WindowViewer from '../components/WindowViewer';
+import { WindowViewer } from '../components/WindowViewer';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/Workspace.js b/src/containers/Workspace.js
index 940214a98f40abbed56f357757a9d524d1a4e356..ea8c5b444a8b9d3a4522dbaedc25bb17af9febd5 100644
--- a/src/containers/Workspace.js
+++ b/src/containers/Workspace.js
@@ -1,6 +1,6 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import Workspace from '../components/Workspace';
+import { Workspace } from '../components/Workspace';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WorkspaceAdd.js b/src/containers/WorkspaceAdd.js
index 92a277f6f18db9374845908d504e94733a50ad4b..9cb48aa06a4c5ca39596787aa9eb0c36de326121 100644
--- a/src/containers/WorkspaceAdd.js
+++ b/src/containers/WorkspaceAdd.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import * as actions from '../state/actions';
-import WorkspaceAdd from '../components/WorkspaceAdd';
+import { WorkspaceAdd } from '../components/WorkspaceAdd';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WorkspaceAddButton.js b/src/containers/WorkspaceAddButton.js
index a52d04d31b4cbfdfae3259593936884f2ec13afc..3f4ec11c3b12263516e9dc4b58efaff01f3e4512 100644
--- a/src/containers/WorkspaceAddButton.js
+++ b/src/containers/WorkspaceAddButton.js
@@ -4,7 +4,7 @@ import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import * as actions from '../state/actions';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WorkspaceAddButton from '../components/WorkspaceAddButton';
+import { WorkspaceAddButton } from '../components/WorkspaceAddButton';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WorkspaceControlPanel.js b/src/containers/WorkspaceControlPanel.js
index d25f6a3e67cfea2bbd5f6a4fe4e2dee99e3e56c3..03fb31567f0c5d4dd4ec0fa1d61111febc60143a 100644
--- a/src/containers/WorkspaceControlPanel.js
+++ b/src/containers/WorkspaceControlPanel.js
@@ -1,5 +1,5 @@
 import { withStyles } from '@material-ui/core/styles';
-import WorkspaceControlPanel from '../components/WorkspaceControlPanel';
+import { WorkspaceControlPanel } from '../components/WorkspaceControlPanel';
 
 /**
  *
diff --git a/src/containers/WorkspaceControlPanelButtons.js b/src/containers/WorkspaceControlPanelButtons.js
index 48a6ea89e416230d38a06bd318fa4186edaa71fb..1535ffb5cc064487e00ab87377eed9a0c8f8438c 100644
--- a/src/containers/WorkspaceControlPanelButtons.js
+++ b/src/containers/WorkspaceControlPanelButtons.js
@@ -1,5 +1,5 @@
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WorkspaceControlPanelButtons
+import { WorkspaceControlPanelButtons }
   from '../components/WorkspaceControlPanelButtons';
 
 export default miradorWithPlugins(WorkspaceControlPanelButtons);
diff --git a/src/containers/WorkspaceExport.js b/src/containers/WorkspaceExport.js
index 5157cafc05a07a2cf0700a6b234e86bd65532d60..92394148181f9e650a6ac2f1c011544355d65737 100644
--- a/src/containers/WorkspaceExport.js
+++ b/src/containers/WorkspaceExport.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WorkspaceExport from '../components/WorkspaceExport';
+import { WorkspaceExport } from '../components/WorkspaceExport';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WorkspaceFullScreenButton.js b/src/containers/WorkspaceFullScreenButton.js
index a274b21e2927cde348b43269b8d97c029f8acdd7..12c48eed36f13072df8655ffdcfa15c8bd7ede3d 100644
--- a/src/containers/WorkspaceFullScreenButton.js
+++ b/src/containers/WorkspaceFullScreenButton.js
@@ -4,7 +4,7 @@ import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import * as actions from '../state/actions';
-import WorkspaceFullScreenButton
+import { WorkspaceFullScreenButton }
   from '../components/WorkspaceFullScreenButton';
 
 /**
diff --git a/src/containers/WorkspaceMenu.js b/src/containers/WorkspaceMenu.js
index 38e36d2bbad72e428818dc301c1b468688a70032..2170058e515b4ffaf74aaff374df253689c9f9bf 100644
--- a/src/containers/WorkspaceMenu.js
+++ b/src/containers/WorkspaceMenu.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
 import * as actions from '../state/actions';
-import WorkspaceMenu from '../components/WorkspaceMenu';
+import { WorkspaceMenu } from '../components/WorkspaceMenu';
 
 /**
  * mapDispatchToProps - used to hook up connect to action creators
diff --git a/src/containers/WorkspaceMenuButton.js b/src/containers/WorkspaceMenuButton.js
index 1273953f2f67a1b6726e0de7d720f70a85556491..139020ccbcd94511558264b99850e364f16aed96 100644
--- a/src/containers/WorkspaceMenuButton.js
+++ b/src/containers/WorkspaceMenuButton.js
@@ -2,7 +2,7 @@ import { compose } from 'redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import miradorWithPlugins from '../lib/miradorWithPlugins';
-import WorkspaceMenuButton from '../components/WorkspaceMenuButton';
+import { WorkspaceMenuButton } from '../components/WorkspaceMenuButton';
 
 /**
  *
diff --git a/src/containers/WorkspaceMosaic.js b/src/containers/WorkspaceMosaic.js
index d6b4a388caf5c5551936a146aabc5d6f0a95b2da..7a1891a480c396c7f391573156678c2ee25cd3d8 100644
--- a/src/containers/WorkspaceMosaic.js
+++ b/src/containers/WorkspaceMosaic.js
@@ -1,7 +1,7 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import * as actions from '../state/actions';
-import WorkspaceMosaic from '../components/WorkspaceMosaic';
+import { WorkspaceMosaic } from '../components/WorkspaceMosaic';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/containers/WorkspaceSettings.js b/src/containers/WorkspaceSettings.js
index 1250a96fac882a542ef4cfed64fde322f12b5921..9ded53451693882ceec32800fffac8b876cbd4a4 100644
--- a/src/containers/WorkspaceSettings.js
+++ b/src/containers/WorkspaceSettings.js
@@ -1,7 +1,7 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
-import WorkspaceSettings from '../components/WorkspaceSettings';
+import { WorkspaceSettings } from '../components/WorkspaceSettings';
 import * as actions from '../state/actions';
 
 /**
diff --git a/src/containers/ZoomControls.js b/src/containers/ZoomControls.js
index a3640e2ff25b860124415d96fe3331668f1b88b6..1173a21a64a70c3e9dabb6ef3be247f9b27fe014 100644
--- a/src/containers/ZoomControls.js
+++ b/src/containers/ZoomControls.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { withNamespaces } from 'react-i18next';
 import { withStyles } from '@material-ui/core';
 import * as actions from '../state/actions';
-import ZoomControls from '../components/ZoomControls';
+import { ZoomControls } from '../components/ZoomControls';
 
 /**
  * mapStateToProps - to hook up connect
diff --git a/src/index.js b/src/index.js
index 406e2a89e6e94cb1a348350daa7a2b69bc41f4ab..89fcbb163453368df0375030687dd22d8c9846e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,9 @@
 import init from './init';
 
+export * from './components';
+export * from './state/actions';
+export * from './state/reducers';
+
 const exports = {
   viewer: init,
   plugins: {},
diff --git a/src/lib/miradorWithPlugins.js b/src/lib/miradorWithPlugins.js
index 407bfe25a909dad758e5f24b3c1c2bf8f766b680..ab24325b3d389fc3cac8ddbad2235de2dd84f7a0 100644
--- a/src/lib/miradorWithPlugins.js
+++ b/src/lib/miradorWithPlugins.js
@@ -37,7 +37,6 @@ export default function miradorWithPlugins(WrappedComponent) {
       return (
         <>
           <WrappedComponent {...this.props} ref={(parent) => { this.pluginParent = parent; }} />
-          { /* TODO: Refactor .name here in some way so we dont need to rely on it */}
           {componentPlugins(WrappedComponent.name, plugins)
             .map(component => React.createElement(
               connect(component.mapStateToProps, component.mapDispatchToProps)(component.component),
@@ -49,9 +48,7 @@ export default function miradorWithPlugins(WrappedComponent) {
     }
   }
 
-  const wrappedComponentName = WrappedComponent.displayName
-  || WrappedComponent.name
-  || 'Component';
+  const wrappedComponentName = WrappedComponent.name || 'Component';
 
   ConnectedComponent.displayName = `miradorWithPlugins(${wrappedComponentName})`;