diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 51a0c2e408aa107de96f4fe31d3dd6035fcf7e19..d75e9f771a35909b1068215e5691f085c6907ed8 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -6,9 +6,7 @@ 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';
-export { default as LeftMenuTitle } from './src/components/LeftMenuTitle';
 export { default as ToolGroupComponent } from './src/components/ToolGroupComponent';
 export { default as ToolGroups } from './src/components/ToolGroups';
 export { default as NoteEditorContainer } from './src/components/notes/NoteEditorContainer';
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 8cb6cfb7797772fbb088f5c69b691a450c57ea16..68eb331d6a90d0b5a2e2a7bfe845360be62ab573 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -30,3 +30,7 @@ export { default as ShortCutsService } from './src/config/defaultServices/ShortC
 
 export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
 export { default as trackedTransaction } from './src/utilities/track-changes/trackedTransaction';
+
+/* Components */
+
+export { default as LeftMenuTitle } from './src/components/LeftMenuTitle';
diff --git a/wax-prosemirror-components/src/components/LeftMenuTitle.js b/wax-prosemirror-core/src/components/LeftMenuTitle.js
similarity index 100%
rename from wax-prosemirror-components/src/components/LeftMenuTitle.js
rename to wax-prosemirror-core/src/components/LeftMenuTitle.js
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index 860f9cc36a5476ba9cee0d0448122e57d344a7bb..0fac58ed91181518c6b584bbe4c24e055b7f3055 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/wax-prosemirror-services/src/ImageService/Image.js
@@ -3,8 +3,8 @@ import React, { useContext } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { ImageUpload } from 'wax-prosemirror-components';
 import { WaxContext, Commands, Tools } from 'wax-prosemirror-core';
+import ImageUpload from './components/ImageUpload';
 import fileUpload from './fileUpload';
 
 @injectable()
diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
similarity index 97%
rename from wax-prosemirror-components/src/components/images/ImageUpload.js
rename to wax-prosemirror-services/src/ImageService/components/ImageUpload.js
index ac9c5be5eda221afef2d28c56e5d3927b2fdb7e3..456d240d7b4733715f9b839e1dd52a3a9d9c49b2 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
@@ -1,9 +1,9 @@
 /* eslint react/prop-types: 0 */
 import React, { useContext, useRef, useMemo } from 'react';
 import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
+import { MenuButton } from 'wax-prosemirror-components';
 import { TextSelection } from 'prosemirror-state';
 import styled from 'styled-components';
-import MenuButton from '../../ui/buttons/MenuButton';
 import insertImage from './Upload';
 
 const Wrapper = styled.div`
diff --git a/wax-prosemirror-components/src/components/images/Upload.js b/wax-prosemirror-services/src/ImageService/components/Upload.js
similarity index 100%
rename from wax-prosemirror-components/src/components/images/Upload.js
rename to wax-prosemirror-services/src/ImageService/components/Upload.js
diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/Display.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/Display.js
index 49495286f1b097170add08276b994c3f2dcc9513..202b974079cb5425a5af88586a02780342e1f8e3 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/Display.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/Display.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { injectable, inject } from 'inversify';
-import { LeftMenuTitle } from 'wax-prosemirror-components';
-import { ToolGroup } from 'wax-prosemirror-core';
+import { ToolGroup, LeftMenuTitle } from 'wax-prosemirror-core';
 
 @injectable()
 class Display extends ToolGroup {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/OENAsideLongToolGroupService/OENAsideLongToolGroup.js b/wax-prosemirror-services/src/WaxToolGroups/OENAsideLongToolGroupService/OENAsideLongToolGroup.js
index e0383e14afbdb965eca94a81fd277b34f039f19b..5d5cf83f489ee3afb23c1ff6eea15d62464d102b 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/OENAsideLongToolGroupService/OENAsideLongToolGroup.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/OENAsideLongToolGroupService/OENAsideLongToolGroup.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { injectable, inject } from 'inversify';
-import { LeftMenuTitle } from 'wax-prosemirror-components';
-import { ToolGroup } from 'wax-prosemirror-core';
+import { ToolGroup, LeftMenuTitle } from 'wax-prosemirror-core';
 
 @injectable()
 class OENAsideLongToolGroup extends ToolGroup {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/OENAsideShortToolGroupService/OENAsideShortToolGroup.js b/wax-prosemirror-services/src/WaxToolGroups/OENAsideShortToolGroupService/OENAsideShortToolGroup.js
index f6616df642e28eeaec3f8d55cf2408552b928894..3827e657acb22cbd34b3b04a7a0aebd0055af8a2 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/OENAsideShortToolGroupService/OENAsideShortToolGroup.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/OENAsideShortToolGroupService/OENAsideShortToolGroup.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { injectable, inject } from 'inversify';
-import { LeftMenuTitle } from 'wax-prosemirror-components';
-import { ToolGroup } from 'wax-prosemirror-core';
+import { ToolGroup, LeftMenuTitle } from 'wax-prosemirror-core';
 
 @injectable()
 class OENAsideShortToolGroup extends ToolGroup {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/Text.js b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/Text.js
index 99134e77df5a3b233f20f546c0ad7fa4025a7488..5e15e6e33c65ceb718d3ffba2783acd0fec19af1 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/Text.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/Text.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { injectable, inject } from 'inversify';
-import { LeftMenuTitle } from 'wax-prosemirror-components';
-import { ToolGroup } from 'wax-prosemirror-core';
+import { ToolGroup, LeftMenuTitle } from 'wax-prosemirror-core';
 
 @injectable()
 class Text extends ToolGroup {