diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index ed41bf671546a8ff786c30388ee378b18462c211..51a0c2e408aa107de96f4fe31d3dd6035fcf7e19 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -4,6 +4,7 @@ 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 CheckBox } from './src/ui/inputs/CheckBox';
 export { default as TableDropDown } from './src/components/tables/TableDropDown';
 export { default as ImageUpload } from './src/components/images/ImageUpload';
 export { default as TitleButton } from './src/components/TitleButton';
@@ -18,7 +19,6 @@ export { default as TrackChangeEnable } from './src/components/trackChanges/Trac
 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 FindAndReplaceTool } from './src/components/findAndReplace/FindAndReplaceTool';
 export { default as FullScreen } from './src/components/various/FullScreen';
 export { default as LeftSideButton } from './src/components/various/LeftSideButton';
 export { default as SpecialCharactersTool } from './src/components/specialCharacters/SpecialCharactersTool';
@@ -35,3 +35,5 @@ export { default as CustomTagBlockComponent } from './src/components/customtag/C
 export { default as SaveButton } from './src/components/SaveButton';
 export { default as ReactDropDownStyles } from './src/helpers/ReactDropDownStyles';
 export { default as OENAsideButton } from './src/components/OEN/OENAsideButton';
+
+export { default as useDebounce } from './src/helpers/useDebounce';
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 06f7ef9b3d397e29fb3cab3a47a9b3553b9c9c46..4c3cea6087d17294646f3b0d38ea7bd5cadabea2 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -35,7 +35,8 @@
     "use-deep-compare-effect": "^1.3.1",
     "uuid": "^7.0.3",
     "wax-prosemirror-components": "^0.6.5",
-    "wax-prosemirror-core": "^0.6.5"
+    "wax-prosemirror-core": "^0.6.5",
+     "@pubsweet/ui-toolkit": "^2.3.1"
   },
   "peerDependencies": {
     "react": "^16.13.1",
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplace.js b/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplace.js
index 420c43f1e8b14b5f82ab75dff5ea564aa237b7ca..4c75a2a4d3044a25ece4ba2b14baba7a97553802 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplace.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplace.js
@@ -2,8 +2,8 @@ import React from 'react';
 import { isEmpty } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { injectable } from 'inversify';
-import { FindAndReplaceTool } from 'wax-prosemirror-components';
 import { Tools } from 'wax-prosemirror-core';
+import FindAndReplaceTool from './components/FindAndReplaceTool';
 
 @injectable()
 export default class FindAndReplace extends Tools {
diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
similarity index 98%
rename from wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
rename to wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
index ba02c7dea2cc92fc4939cb2ecd15eac287058ca9..5f9541a257dbe7aa4d305b96871ad801aabdc23e 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
@@ -4,10 +4,8 @@ import { each, eachRight } from 'lodash';
 import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
 import styled from 'styled-components';
 import { grid, th } from '@pubsweet/ui-toolkit';
-import Icon from '../../helpers/Icon';
-import CheckBox from '../../ui/inputs/CheckBox';
+import { Icon, CheckBox, useDebounce } from 'wax-prosemirror-components';
 import helpers from './helpers';
-import useDebounce from '../../helpers/useDebounce';
 
 const Wrapper = styled.div`
   background: #fff;
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceComponent.js
similarity index 100%
rename from wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
rename to wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceComponent.js
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
similarity index 97%
rename from wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
rename to wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
index 6d0a332de8efe83bb066bc8b8c7ffc16fc0a938c..5a16b89615889405de1e23c98c7ef324d4276e79 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
@@ -10,7 +10,7 @@ import React, {
 import styled from 'styled-components';
 import { grid } from '@pubsweet/ui-toolkit';
 import { WaxContext } from 'wax-prosemirror-core';
-import MenuButton from '../../ui/buttons/MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
 import FindAndReplaceComponent from './FindAndReplaceComponent';
 
 const Wrapper = styled.div`
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
similarity index 98%
rename from wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
rename to wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
index 3cfb5597a1d8e7193cbe837f32efc4b80603aa45..21bc44244af9ca56083b5b5c3c9dcf5f89cfd1cb 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
@@ -5,9 +5,8 @@ import { each, eachRight } from 'lodash';
 import styled from 'styled-components';
 import { grid } from '@pubsweet/ui-toolkit';
 import { WaxContext } from 'wax-prosemirror-core';
-import Icon from '../../helpers/Icon';
+import { Icon, useDebounce } from 'wax-prosemirror-components';
 import helpers from './helpers';
-import useDebounce from '../../helpers/useDebounce';
 
 const Wrapper = styled.div`
   background: #fff;
diff --git a/wax-prosemirror-components/src/components/findAndReplace/helpers.js b/wax-prosemirror-services/src/FindAndReplaceService/components/helpers.js
similarity index 100%
rename from wax-prosemirror-components/src/components/findAndReplace/helpers.js
rename to wax-prosemirror-services/src/FindAndReplaceService/components/helpers.js