diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 124f1de51b8d2b061f4f697af228e9950369c543..b10ab854e2e14117ba565eeb00fa1736de06897e 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -3,8 +3,6 @@ export { default as UndoRedoButton } from './src/components/UndoRedoButton';
 export { default as MenuButton } from './src/ui/buttons/MenuButton';
 export { default as icons } from './src/icons/icons';
 export { default as Icon } from './src/helpers/Icon';
-export { default as ToolGroupComponent } from './src/components/ToolGroupComponent';
-export { default as ToolGroups } from './src/components/ToolGroups';
 
 export { default as Tabs } from './src/ui/tabs/Tabs';
 export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 6606b1c41254cdb02cb3d32ca06f149203201d2b..1550c8d408e9e7b50de09fe43fad0d843e034dd4 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -39,3 +39,5 @@ export { default as ReactDropDownStyles } from './src/components/helpers/ReactDr
 export { default as DateParser } from './src/components/helpers/DateParser';
 export { default as useDebounce } from './src/components/helpers/useDebounce';
 export { default as useOnClickOutside } from './src/components/helpers/useOnClickOutside';
+export { default as ToolGroupComponent } from './src/components/ToolGroupComponent';
+export { default as ToolGroups } from './src/components/ToolGroups';
diff --git a/wax-prosemirror-components/src/components/ToolGroupComponent.js b/wax-prosemirror-core/src/components/ToolGroupComponent.js
similarity index 95%
rename from wax-prosemirror-components/src/components/ToolGroupComponent.js
rename to wax-prosemirror-core/src/components/ToolGroupComponent.js
index cce0f8b1c7b4e682de960f4ef5974e038195d6cb..f54b0135c3eaa6c6a5acd56414987862aeba9718 100644
--- a/wax-prosemirror-components/src/components/ToolGroupComponent.js
+++ b/wax-prosemirror-core/src/components/ToolGroupComponent.js
@@ -2,7 +2,7 @@
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
-import Dropdown from '../ui/buttons/Dropdown';
+import Dropdown from './buttons/Dropdown';
 
 const Wrapper = styled.div`
   align-items: center;
diff --git a/wax-prosemirror-components/src/components/ToolGroups.js b/wax-prosemirror-core/src/components/ToolGroups.js
similarity index 73%
rename from wax-prosemirror-components/src/components/ToolGroups.js
rename to wax-prosemirror-core/src/components/ToolGroups.js
index 0c60229d3d024b18836a55f7590f88db3f56c806..d35ae6f220d128ee119490c0c00520bab4587576 100644
--- a/wax-prosemirror-components/src/components/ToolGroups.js
+++ b/wax-prosemirror-core/src/components/ToolGroups.js
@@ -7,16 +7,11 @@ import ToolGroupComponent from './ToolGroupComponent';
 const ToolGroups = ({ toolGroups, view }) => {
   return toolGroups.map(toolGroup => {
     if (toolGroup._toolGroups.length > 0) {
+      // eslint-disable-next-line react/jsx-filename-extension
       return <ToolGroups toolGroups={toolGroup._toolGroups} view={view} />;
     }
     return (
-      <ToolGroupComponent
-        key={uuidv4()}
-        tools={toolGroup._tools}
-        view={view}
-        // title={this.title}
-        // name={name}
-      />
+      <ToolGroupComponent key={uuidv4()} tools={toolGroup._tools} view={view} />
     );
   });
 };
diff --git a/wax-prosemirror-components/src/ui/buttons/Dropdown.js b/wax-prosemirror-core/src/components/buttons/Dropdown.js
similarity index 95%
rename from wax-prosemirror-components/src/ui/buttons/Dropdown.js
rename to wax-prosemirror-core/src/components/buttons/Dropdown.js
index 3085205fc08110fae72cb558ebf69314a2420d14..e92b931c9a36a3b4e2b26b343c443cde6a285a01 100644
--- a/wax-prosemirror-components/src/ui/buttons/Dropdown.js
+++ b/wax-prosemirror-core/src/components/buttons/Dropdown.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import styled from 'styled-components';
 
 import { grid, override } from '@pubsweet/ui-toolkit';
-import MenuButton from './MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
 
 // font size 0 reason: https://stackoverflow.com/a/19212391
 const Wrapper = styled.div`
diff --git a/wax-prosemirror-core/src/utilities/lib/ToolGroup.js b/wax-prosemirror-core/src/utilities/lib/ToolGroup.js
index 2a5e51b390427a4b6473d8f4660489538697ae0d..6c2c3b0de574d1e62642bc6a1b8e410a185a40b9 100644
--- a/wax-prosemirror-core/src/utilities/lib/ToolGroup.js
+++ b/wax-prosemirror-core/src/utilities/lib/ToolGroup.js
@@ -1,9 +1,10 @@
 /* eslint-disable no-underscore-dangle */
 import React, { useMemo } from 'react';
 import { injectable, inject } from 'inversify';
-import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components';
 import { v4 as uuidv4 } from 'uuid';
 import { isEmpty } from 'lodash';
+import ToolGroups from '../../components/ToolGroups';
+import ToolGroupComponent from '../../components/ToolGroupComponent';
 import 'reflect-metadata';
 
 @injectable()
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
index 768dc96963a0824cb35b3491b42bba42d760da49..10644c26ced48a8a12ea7a494343ea1e0632069c 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
@@ -1,9 +1,8 @@
 import React, { useMemo } from 'react';
 import { injectable, inject } from 'inversify';
-import { ToolGroupComponent } from 'wax-prosemirror-components';
 import { isEmpty } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import { ToolGroup } from 'wax-prosemirror-core';
+import { ToolGroup, ToolGroupComponent } from 'wax-prosemirror-core';
 
 @injectable()
 class Annotations extends ToolGroup {