diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index ee58d0f06078cb31159373cdb9c5027ce71cadb7..aa34018db213f1bb255ce27bd0e5532924ce841e 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -15,7 +15,6 @@ export { default as CreateTable } from './src/components/tables/CreateTable';
 export { default as Tabs } from './src/ui/tabs/Tabs';
 export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
 export { default as SpecialCharactersTool } from './src/components/specialCharacters/SpecialCharactersTool';
-export { default as TextHighlightingTool } from './src/components/textHighlight/TextHighlightingTool';
 export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool';
 export { default as EditorShortCutsTool } from './src/components/EditorInfo/EditorShortCutsTool';
 
@@ -28,4 +27,5 @@ export { default as CustomTagBlockComponent } from './src/components/customtag/C
 export { default as ReactDropDownStyles } from './src/helpers/ReactDropDownStyles';
 
 export { default as useDebounce } from './src/helpers/useDebounce';
+export { default as useOnClickOutside } from './src/helpers/useOnClickOutside';
 export { default as CheckBox } from './src/ui/inputs/CheckBox';
diff --git a/wax-prosemirror-services/src/HighlightService/TextHighlightTool.js b/wax-prosemirror-services/src/HighlightService/TextHighlightTool.js
index 318737156889a47d090df6094c1439fe099fa19d..1953e140b7668265cb0c20e41db1f39b61d6c3e5 100644
--- a/wax-prosemirror-services/src/HighlightService/TextHighlightTool.js
+++ b/wax-prosemirror-services/src/HighlightService/TextHighlightTool.js
@@ -1,10 +1,10 @@
 /* eslint-disable no-underscore-dangle */
 import React from 'react';
 import { injectable } from 'inversify';
-import { TextHighlightingTool } from 'wax-prosemirror-components';
 import { isEmpty } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { Tools } from 'wax-prosemirror-core';
+import TextHighlightingTool from './components/TextHighlightingTool';
 
 @injectable()
 class TextHighlightTool extends Tools {
diff --git a/wax-prosemirror-components/src/components/textHighlight/TextHighlightingTool.js b/wax-prosemirror-services/src/HighlightService/components/TextHighlightingTool.js
similarity index 97%
rename from wax-prosemirror-components/src/components/textHighlight/TextHighlightingTool.js
rename to wax-prosemirror-services/src/HighlightService/components/TextHighlightingTool.js
index 3f5eb2d5c8c8b2e90a5683a9f00e4da7cafab753..8d210207fefcc7c271401cec8774e2d27495751f 100644
--- a/wax-prosemirror-components/src/components/textHighlight/TextHighlightingTool.js
+++ b/wax-prosemirror-services/src/HighlightService/components/TextHighlightingTool.js
@@ -3,8 +3,7 @@ import styled from 'styled-components';
 import { grid } from '@pubsweet/ui-toolkit';
 import { v4 as uuidv4 } from 'uuid';
 import { WaxContext } from 'wax-prosemirror-core';
-import MenuButton from '../../ui/buttons/MenuButton';
-import useOnClickOutside from '../../helpers/useOnClickOutside';
+import { MenuButton, useOnClickOutside } from 'wax-prosemirror-components';
 
 const Wrapper = styled.div`
   font-size: 0;