diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index d75e9f771a35909b1068215e5691f085c6907ed8..6870d2819132ae2139a0bc546a6367a75471c6ff 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -1,10 +1,8 @@
-export { default as Overlay } from './src/components/Overlay';
 export { default as Button } from './src/components/Button';
 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 TitleButton } from './src/components/TitleButton';
 export { default as ToolGroupComponent } from './src/components/ToolGroupComponent';
@@ -35,3 +33,4 @@ export { default as ReactDropDownStyles } from './src/helpers/ReactDropDownStyle
 export { default as OENAsideButton } from './src/components/OEN/OENAsideButton';
 
 export { default as useDebounce } from './src/helpers/useDebounce';
+export { default as CheckBox } from './src/ui/inputs/CheckBox';
diff --git a/wax-prosemirror-components/src/components/Overlay.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverLay.js
similarity index 100%
rename from wax-prosemirror-components/src/components/Overlay.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/OverLay.js
diff --git a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
index 754757a65a85848aa39e9dfba8842bf784b74c10..d324297306e166a9579f57124d9bc346ad96587b 100644
--- a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
+++ b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
@@ -1,6 +1,6 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React, { useMemo, useContext } from 'react';
-import { Overlay } from 'wax-prosemirror-components';
+import Overlay from './OverLay';
 import { WaxContext } from '../../../WaxContext';
 import usePosition from './usePosition';