diff --git a/src/taxonomy/index.js b/src/taxonomy/index.js
index 789be9255a..356c532411 100644
--- a/src/taxonomy/index.js
+++ b/src/taxonomy/index.js
@@ -1,3 +1,3 @@
 export { default as TaxonomyListPage } from './TaxonomyListPage';
 export { default as TaxonomyLayout } from './TaxonomyLayout';
-export { default as TaxonomyDetailPage } from './taxonomy-detail/TaxonomyDetailPage';
+export { TaxonomyDetailPage } from './taxonomy-detail';
diff --git a/src/taxonomy/tag-list/TagListTable.jsx b/src/taxonomy/tag-list/TagListTable.jsx
index 6e8adc3dc3..a7ae3d950c 100644
--- a/src/taxonomy/tag-list/TagListTable.jsx
+++ b/src/taxonomy/tag-list/TagListTable.jsx
@@ -6,9 +6,8 @@ import _ from 'lodash';
 import Proptypes from 'prop-types';
 import { useState } from 'react';
 
-import messages from '../../messages';
-import taxonomyMessages from '../messages';
-import { useTagListDataResponse, useTagListDataStatus } from '../api/hooks/selectors';
+import messages from './messages';
+import { useTagListDataResponse, useTagListDataStatus } from './data/selectors';
 
 const TagListTable = ({ taxonomyId }) => {
   const intl = useIntl();
@@ -48,7 +47,7 @@ const TagListTable = ({ taxonomyId }) => {
       initialState={options}
       columns={[
         {
-          Header: intl.formatMessage(taxonomyMessages.tagListColumnValueHeader),
+          Header: intl.formatMessage(messages.tagListColumnValueHeader),
           accessor: 'value',
         },
       ]}
diff --git a/src/taxonomy/tag-list/index.js b/src/taxonomy/tag-list/index.js
new file mode 100644
index 0000000000..ac0ce31b3d
--- /dev/null
+++ b/src/taxonomy/tag-list/index.js
@@ -0,0 +1 @@
+export { default as TagListTable } from './TagListTable'; // eslint-disable-line import/prefer-default-export
diff --git a/src/taxonomy/taxonomy-detail/TaxonomyDetailMenu.jsx b/src/taxonomy/taxonomy-detail/TaxonomyDetailMenu.jsx
index 6fd7613e12..1f2aa839d2 100644
--- a/src/taxonomy/taxonomy-detail/TaxonomyDetailMenu.jsx
+++ b/src/taxonomy/taxonomy-detail/TaxonomyDetailMenu.jsx
@@ -7,7 +7,6 @@ import {
 import PropTypes from 'prop-types';
 
 import messages from './messages';
-import taxonomyMessages from '../messages';
 
 const TaxonomyDetailMenu = ({
   id, name, disabled, onClickMenuItem,
@@ -18,11 +17,11 @@ const TaxonomyDetailMenu = ({
     <DropdownButton
       id={id}
       title={intl.formatMessage(messages.actionsButtonLabel)}
-      alt={intl.formatMessage(taxonomyMessages.taxonomyMenuAlt, { name })}
+      alt={intl.formatMessage(messages.actionsButtonAlt, { name })}
       disabled={disabled}
     >
       <Dropdown.Item onClick={() => onClickMenuItem('export')}>
-        {intl.formatMessage(taxonomyMessages.taxonomyCardExportMenu)}
+        {intl.formatMessage(messages.exportMenu)}
       </Dropdown.Item>
     </DropdownButton>
   );
diff --git a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx
index 23ddf046f0..6c39a0e23b 100644
--- a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx
+++ b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx
@@ -1,3 +1,4 @@
+// ts-check
 import React, { useState } from 'react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import {
@@ -10,11 +11,11 @@ import { Link, useParams } from 'react-router-dom';
 import ConnectionErrorAlert from '../../generic/ConnectionErrorAlert';
 import Loading from '../../generic/Loading';
 import SubHeader from '../../generic/sub-header/SubHeader';
-import messages from './messages';
+import taxonomyMessages from '../messages';
 import TaxonomyDetailMenu from './TaxonomyDetailMenu';
 import TaxonomyDetailSideCard from './TaxonomyDetailSideCard';
-import TagListTable from './TagListTable';
-import ExportModal from '../modals/ExportModal';
+import { TagListTable } from '../tag-list';
+import ExportModal from '../export-modal';
 import { useTaxonomyDetailDataResponse, useTaxonomyDetailDataStatus } from './data/selectors';
 
 const TaxonomyDetailPage = () => {
@@ -89,7 +90,7 @@ const TaxonomyDetailPage = () => {
         <Container size="xl">
           <Breadcrumb
             links={[
-              { label: intl.formatMessage(messages.headerTitle), to: '/taxonomy-list/' },
+              { label: intl.formatMessage(taxonomyMessages.headerTitle), to: '/taxonomy-list/' },
             ]}
             activeLabel={taxonomy.name}
             linkAs={Link}
diff --git a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.test.jsx b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.test.jsx
index 40bbe73421..dff4b3c953 100644
--- a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.test.jsx
+++ b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.test.jsx
@@ -4,13 +4,13 @@ import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { AppProvider } from '@edx/frontend-platform/react';
 import { fireEvent, render } from '@testing-library/react';
 
-import { useTaxonomyDetailData } from '../api/hooks/api';
+import { useTaxonomyDetailData } from './data/api';
 import initializeStore from '../../store';
 import TaxonomyDetailPage from './TaxonomyDetailPage';
 
 let store;
 
-jest.mock('../api/hooks/api', () => ({
+jest.mock('./data/api', () => ({
   useTaxonomyDetailData: jest.fn(),
 }));
 jest.mock('react-router-dom', () => ({
diff --git a/src/taxonomy/taxonomy-detail/index.js b/src/taxonomy/taxonomy-detail/index.js
new file mode 100644
index 0000000000..5665033c97
--- /dev/null
+++ b/src/taxonomy/taxonomy-detail/index.js
@@ -0,0 +1,2 @@
+// ts-check
+export { default as TaxonomyDetailPage } from './TaxonomyDetailPage'; // eslint-disable-line import/prefer-default-export
diff --git a/src/taxonomy/taxonomy-detail/messages.js b/src/taxonomy/taxonomy-detail/messages.js
index a1d9c15404..ec5291f6c0 100644
--- a/src/taxonomy/taxonomy-detail/messages.js
+++ b/src/taxonomy/taxonomy-detail/messages.js
@@ -1,3 +1,4 @@
+// ts-check
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
@@ -17,6 +18,14 @@ const messages = defineMessages({
     id: 'course-authoring.taxonomy-detail.action.button.label',
     defaultMessage: 'Actions',
   },
+  actionsButtonAlt: {
+    id: 'course-authoring.taxonomy-detail.action.button.alt',
+    defaultMessage: '{name} actions',
+  },
+  exportMenu: {
+    id: 'course-authoring.taxonomy-detail.action.export',
+    defaultMessage: 'Export',
+  },
 });
 
 export default messages;