diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index a454c501e67a809ce5dc8f1a26533564406d2b0b..d969e668be7cd60e07725a49126c99ab2d136c04 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -1,6 +1,2 @@
-export { default as Service } from "./src/services/Service";
-export { WaxContext } from "./src/ioc-react";
+export { WaxContext, useInjection } from "./src/ioc-react";
 export { default as Wax } from "./src/Wax";
-export {
-  default as componentPlugin
-} from "./src/services/LayoutService/components/componentPlugin";
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index d006ad5ed7ffafa2df0192e7d1b1fe9e82042847..eaa95d45ef647bff2b2887fe3cae23fb418259f8 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -1,9 +1,9 @@
-import LayoutService from "../services/LayoutService/LayoutService";
 import {
   SchemaService,
   MenuService,
   RulesService,
-  ShortCutsService
+  ShortCutsService,
+  LayoutService
 } from "wax-prosemirror-services";
 
 export default {
diff --git a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
index 43ed8012421c9f4bc879ccfa06a28128531882c2..b14375b4dfdf4e9614b67eb94517ba3e6ec4113e 100644
--- a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
+++ b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
@@ -1,7 +1,7 @@
 import React, { useContext } from "react";
 import styled, { ThemeProvider } from "styled-components";
 import { InfoArea } from "wax-prosemirror-components";
-import { componentPlugin, Service } from "wax-prosemirror-core";
+import { componentPlugin } from "wax-prosemirror-services";
 import EditorElements from "./EditorElements";
 import { cokoTheme } from "wax-prosemirror-themes";
 import { DocumentHelpers } from "wax-prosemirror-utilities";
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index fb86aeabe150a802e6b2817166ae5c0c2a46a992..515a0d252cfaea56b85c9858a811cd606879367d 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -1,3 +1,7 @@
+export {
+  default as componentPlugin
+} from "./src/LayoutService/components/componentPlugin";
+export { default as LayoutService } from "./src/LayoutService/LayoutService";
 export { default as MenuService } from "./src/MenuService/MenuService";
 export { default as LinkService } from "./src/LinkService/LinkService";
 export {
diff --git a/wax-prosemirror-services/src/BaseService/BaseService.js b/wax-prosemirror-services/src/BaseService/BaseService.js
index 11f07fb3fb998196e0d2054a3011e814b88c2baf..f1918417203545ebdf724304ef165fbbaa1c5440 100644
--- a/wax-prosemirror-services/src/BaseService/BaseService.js
+++ b/wax-prosemirror-services/src/BaseService/BaseService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import BaseServices from "./index";
 
 class BaseService extends Service {
diff --git a/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js b/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js
index 80b1933f23109e214edbe46f81a7dd55ab725260..327a838a1350926d397cc262e3466739f587f346 100644
--- a/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js
+++ b/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Redo from "./Redo";
 
 class RedoService extends Service {
diff --git a/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js b/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js
index 94956e3ecc5579d3fceddb70b2414a70a0f9b4b3..ac129b12b9f148d9fa8c8f8df132e2441b3c8036 100644
--- a/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js
+++ b/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Save from "./Save";
 
 class SaveService extends Service {
diff --git a/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js b/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js
index a47dabf1b2a635fd0e387343626e46b3943a1a47..eba135b1e5c15bdf5e5abaee8692295f3d67bea8 100644
--- a/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js
+++ b/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Undo from "./Undo";
 
 class UndoService extends Service {
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 97b94ea493e0597210e7f8845be1196f7d9db54b..fb0a3fbd524a4993119bfee56e55af295264067f 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import { commentMark } from "wax-prosemirror-schema";
 import {
   CommentComponent,
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/AuthorService.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/AuthorService.js
index bf378858cc803f895073adb14d8b74ec1608b6e9..f937c12580eacd66a3a41dd22e552807929c4e8a 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/AuthorService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/AuthorService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { authorNode } from "wax-prosemirror-schema";
 import Author from "./Author";
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js b/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js
index 86a15d76ce4d03b888c1035daecc3ae60ed232bb..0e10e83339e2c600a1dc1f7cca907c21d640dcd3 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import DisplayServices from "./index";
 
 class DisplayBlockLevelService extends Service {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js
index 921999613ed4b256826b64dabdb41aa59d6f1529..dc8842b2034e1e9f1c1fb1feda33a894f96c6704 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { epigraphPoetryNode } from "wax-prosemirror-schema";
 import EpigraphPoetry from "./EpigraphPoetry";
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProseService.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProseService.js
index a848a780acbb3b91d6a0173ceb480d5ee6723d97..a32f9aaa041d636ccfde6d0960dd404cba3e55ab 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProseService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProseService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { epigraphProseNode } from "wax-prosemirror-schema";
 import EpigraphProse from "./EpigraphProse";
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/HeadingService.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/HeadingService.js
index 290c8f1015b1768cd59771407ed230d47b8a17f2..6d4925468eed645fd513b64ecd7048f4913e6cf9 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/HeadingService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/HeadingService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { headingNode } from "wax-prosemirror-schema";
 import Heading1 from "./Heading1";
 import Heading2 from "./Heading2";
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitleService.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitleService.js
index 681001c43a581fb7426efad0d8247ede05fe687f..854dfe2be0e7a7ffd02e3dcc96dea55e149151ec 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitleService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitleService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { subTitleNode } from "wax-prosemirror-schema";
 import SubTitle from "./SubTitle";
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/TitleService.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/TitleService.js
index bf3dea5d3bade6279f3ff9574fff012c88fe5850..410306a69887bf0ff7ffd93a4559544ae8d8063f 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/TitleService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/TitleService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { titleNode } from "wax-prosemirror-schema";
 import Title from "./Title";
 
diff --git a/wax-prosemirror-services/src/ImageService/ImageService.js b/wax-prosemirror-services/src/ImageService/ImageService.js
index a4c06b16334d6700aeb056e04d07588d1b97bea0..8e2ed795c1ade1d09a6dd65f14383e102f3d196f 100644
--- a/wax-prosemirror-services/src/ImageService/ImageService.js
+++ b/wax-prosemirror-services/src/ImageService/ImageService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import Image from "./Image";
 import { imageNode } from "wax-prosemirror-schema";
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
index 191adc2a52de5deb7ec598a71b2cad1bb82e6787..833699625840277e7c9ebc37db97b9babe24347f 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { toggleMark } from "prosemirror-commands";
 import { codeMark } from "wax-prosemirror-schema";
 import Code from "./Code";
diff --git a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
index 57f542c4299f71eb3381760c770e2a8238e94a73..11f2e42c2552130fbe7eeeb4cde9f539e23c5aef 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { toggleMark } from "prosemirror-commands";
 import { emphasisMark } from "wax-prosemirror-schema";
 import Emphasis from "./Emphasis";
diff --git a/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js b/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
index 051c48d25cf8db267dd08a27c3d81b535b70f06c..76e753be9fcf8b4d68633b149ace953a713c6eda 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import InlineServices from "./index";
 
 class InlineAnnotationsService extends Service {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
index 45bfdba51538d65cd3468252fb1e7b53ae03299e..990e10f6ec669bbbaf0f81606ef9ebb65784fdf4 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { smallcapsMark } from "wax-prosemirror-schema";
 import SmallCaps from "./SmallCaps";
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
index 5d26c46d39d9b178a0b2ca9e841220947cec82fe..f7b757791ff800b8afb6119bc0fbf53d8b7fb036 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { strikethroughMark } from "wax-prosemirror-schema";
 import StrikeThrough from "./StrikeThrough";
 class StrikeThroughService extends Service {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js b/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
index ab4d8475470b2bdeb2b2456545ff479027c1ae21..21d9ad3d4528fe86bfae4877ef2a695e4c09b6b8 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { toggleMark } from "prosemirror-commands";
 import { strongMark } from "wax-prosemirror-schema";
 import Strong from "./Strong";
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
index fefec688781e32dcfa690f2353d055f6ab91f647..d27a8a94c50e5f6ff0bb66860d6f1ab55eb607e8 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { subscriptMark } from "wax-prosemirror-schema";
 import Subscript from "./Subscript";
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
index c3e3659bce7ae01a826032c9b6b237ebfb2682d5..85b92cbbfa16131cc7adcd471314db7c5ee1c961 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { superscriptMark } from "wax-prosemirror-schema";
 import Superscript from "./Superscript";
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
index d5874c94af2d540a11fd4bb4f564ec951bcb9d6a..5035e45d527749b1fd24c5f25c912e1de0697f7e 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { toggleMark } from "prosemirror-commands";
 import { underlineMark } from "wax-prosemirror-schema";
 import Underline from "./Underline";
diff --git a/wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js b/wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js
similarity index 100%
rename from wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js
rename to wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/Layout.js b/wax-prosemirror-services/src/LayoutService/Layout.js
similarity index 100%
rename from wax-prosemirror-core/src/services/LayoutService/Layout.js
rename to wax-prosemirror-services/src/LayoutService/Layout.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/LayoutService.js b/wax-prosemirror-services/src/LayoutService/LayoutService.js
similarity index 100%
rename from wax-prosemirror-core/src/services/LayoutService/LayoutService.js
rename to wax-prosemirror-services/src/LayoutService/LayoutService.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/components/LayoutFactory.js b/wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js
similarity index 100%
rename from wax-prosemirror-core/src/services/LayoutService/components/LayoutFactory.js
rename to wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/components/componentPlugin.js b/wax-prosemirror-services/src/LayoutService/components/componentPlugin.js
similarity index 93%
rename from wax-prosemirror-core/src/services/LayoutService/components/componentPlugin.js
rename to wax-prosemirror-services/src/LayoutService/components/componentPlugin.js
index 729d4f7b63ebca88edd628683ea7ffb0286351ea..d3e1e33432109be5db908f80978a2ca69423b8bf 100644
--- a/wax-prosemirror-core/src/services/LayoutService/components/componentPlugin.js
+++ b/wax-prosemirror-services/src/LayoutService/components/componentPlugin.js
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
-import { useInjection } from "../../../ioc-react";
+import { useInjection } from "wax-prosemirror-core";
+
 class UpdateView extends Component {
   constructor(props) {
     super(props);
diff --git a/wax-prosemirror-services/src/LinkService/LinkService.js b/wax-prosemirror-services/src/LinkService/LinkService.js
index 31624c641e30b96d64bbdde4312c20ed4f2ae414..b6563d6125fedb6cfd41783a35502f04ac1438fe 100644
--- a/wax-prosemirror-services/src/LinkService/LinkService.js
+++ b/wax-prosemirror-services/src/LinkService/LinkService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import { LinkComponent } from "wax-prosemirror-components";
 import { linkMark } from "wax-prosemirror-schema";
 import LinkTool from "./LinkTool";
diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
index 85e0d1dacdca3709b0d01563b4db5918a4d1cdb3..e4e323854a8a8e3a8a7fe9f1acce854794efff92 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { wrapInList } from "prosemirror-schema-list";
 import { bulletListNode } from "wax-prosemirror-schema";
 import BulletList from "./BulletList";
diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
index 36e3b1f4810e524a0cbe503ecf8eaa8836a1bb89..32e83e84094400f89242e99060c707982fd2da13 100644
--- a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
+++ b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import JoinUp from "./JoinUp";
 
 class JoinUpService extends Service {
diff --git a/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js b/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
index f594a61c1ec16f68d518f17bf70d3aeda92f4b19..a074a2f82b4786130ec6e651e38323ad6ac17c6e 100644
--- a/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
+++ b/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { liftListItem, sinkListItem } from "prosemirror-schema-list";
 import Lift from "./Lift";
 
diff --git a/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js b/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
index abccb39399b1cc316912f0bbfe2a4f52745cbad1..828e4436c8c56b3fab8d4ebf3d13597be2fa2454 100644
--- a/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
+++ b/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { listItemNode } from "wax-prosemirror-schema";
 
 class ListItemService extends Service {
diff --git a/wax-prosemirror-services/src/ListsService/ListsService.js b/wax-prosemirror-services/src/ListsService/ListsService.js
index e8ee63462c07006556857ab79a9673ff8b158a6e..3e1fd350729b7457a2a805b77e9cef76d9961ad0 100644
--- a/wax-prosemirror-services/src/ListsService/ListsService.js
+++ b/wax-prosemirror-services/src/ListsService/ListsService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import ListsServices from "./index";
 
 class ListsService extends Service {
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
index 977546208524f18afab634701867b8cded89ae41..23aad6d5fd82d212f664ff8c59ab0a5383bb9ed8 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { wrapInList } from "prosemirror-schema-list";
 import { orderedListNode } from "wax-prosemirror-schema";
 import OrderedList from "./OrderedList";
diff --git a/wax-prosemirror-services/src/MenuService/MenuService.js b/wax-prosemirror-services/src/MenuService/MenuService.js
index 2497e71c034b94c6db010e244693e5d998e35a50..08fa2c5ecba02d8cf1f79597cf6ff78071a41cb9 100644
--- a/wax-prosemirror-services/src/MenuService/MenuService.js
+++ b/wax-prosemirror-services/src/MenuService/MenuService.js
@@ -1,5 +1,5 @@
 import { isPlainObject, isFunction } from "lodash";
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import Menu from "./Menu";
 import MenuCollection from "./MenuCollection";
 
diff --git a/wax-prosemirror-services/src/ModalService/ModalService.js b/wax-prosemirror-services/src/ModalService/ModalService.js
index ef75f9153d5e2b2e65873b0b2934bf25ee3c8287..546a52ffb503c2a5b9e4c5dc2069ee874c568760 100644
--- a/wax-prosemirror-services/src/ModalService/ModalService.js
+++ b/wax-prosemirror-services/src/ModalService/ModalService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import ModalPlugin from "./pmPlugins/ModalPlugin";
 import ModalComponent from "./ModalComponent";
 const PLUGIN_KEY = "overlay";
diff --git a/wax-prosemirror-services/src/NoteService/NoteService.js b/wax-prosemirror-services/src/NoteService/NoteService.js
index 09b0125f7f6abb7b2890ad2aa68ee10763dbc9a1..c28ca7ff8e2b6418b9424215bf051b2d8cf87687 100644
--- a/wax-prosemirror-services/src/NoteService/NoteService.js
+++ b/wax-prosemirror-services/src/NoteService/NoteService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import { footNoteNode } from "wax-prosemirror-schema";
 import { CommentBubbleComponent } from "wax-prosemirror-components";
 import Note from "./Note";
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayService.js b/wax-prosemirror-services/src/OverlayService/OverlayService.js
index dc24c71a900fe30a439e7cc204b3f5d935a1145d..f16b45f0e79124ba24d7c33609ac56c1770838e8 100644
--- a/wax-prosemirror-services/src/OverlayService/OverlayService.js
+++ b/wax-prosemirror-services/src/OverlayService/OverlayService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import OverlayComponent from "./OverlayComponent";
 
 export default class OverlayService extends Service {
diff --git a/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js b/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js
index 9b994ec2712c7db25ab3ccba6a6d992c7e366a36..37f9787f93be65f2f98e4fa5ddfc29274282467e 100644
--- a/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js
+++ b/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import placeholderPlugin from "./pmPlugins/placeholderPlugin";
 const PLUGIN_KEY = "imagePlaceHolder";
 
diff --git a/wax-prosemirror-services/src/RulesService/RulesService.js b/wax-prosemirror-services/src/RulesService/RulesService.js
index 6ea9380eb536618a4610572f1fa889bc4303402b..0e495117144e75f81088df451e48d1d9e9bc3e88 100644
--- a/wax-prosemirror-services/src/RulesService/RulesService.js
+++ b/wax-prosemirror-services/src/RulesService/RulesService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import Rules from "./Rules";
 
 export default class RulesService extends Service {
diff --git a/wax-prosemirror-services/src/SchemaService/SchemaService.js b/wax-prosemirror-services/src/SchemaService/SchemaService.js
index d9cfc8b6d5c35193daddca6fbe00c7781395beb2..ba79ba110a5cc04be0ef340577c56a0d2c5690b3 100644
--- a/wax-prosemirror-services/src/SchemaService/SchemaService.js
+++ b/wax-prosemirror-services/src/SchemaService/SchemaService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import Schema from "./Schema";
 import Node from "./Node";
 import Mark from "./Mark";
diff --git a/wax-prosemirror-core/src/services/Service.js b/wax-prosemirror-services/src/Service.js
similarity index 100%
rename from wax-prosemirror-core/src/services/Service.js
rename to wax-prosemirror-services/src/Service.js
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js b/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
index d17b988eeb08e9533c0cf50e4f3e11fa99f702d6..f558ae8743c3791e2b36ada70efe09ae412bd51f 100644
--- a/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
+++ b/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import ShortCuts from "./ShortCuts";
 
 export default class ShortCutsService extends Service {
diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
index 8e0b1ccf6914d345e591a83c521b263bc713c400..8c113349ecd0747dd2ad344eb04032ab1b3a521c 100644
--- a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import TableDropDownOptions from "./TableDropDownOptions";
 
 class EditTableService extends Service {
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
index 10baaab523f8918cd7c9959c04f26dba7c79b3a0..98cce559eea634b4aea192413fd78f4a37b565f1 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { tableNodes, goToNextCell } from "prosemirror-tables";
 import Table from "./Table";
 
diff --git a/wax-prosemirror-services/src/TablesService/TablesService.js b/wax-prosemirror-services/src/TablesService/TablesService.js
index 69910e5b2694341af39257df4af3a3bf6d730cfa..1172660adaed87bd1b3d8bfc67b4064528c25957 100644
--- a/wax-prosemirror-services/src/TablesService/TablesService.js
+++ b/wax-prosemirror-services/src/TablesService/TablesService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import TablesServices from "./index";
 
 class TablesService extends Service {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js
index c75b9441bc457e5c2b72c4207f9b4f6f7fdbd6e9..3878ee9b67ca2ae7ffcea62e485926e02a082e38 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { blockQuoteNode } from "wax-prosemirror-schema";
 import BlockQuote from "./BlockQuote";
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetryService.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetryService.js
index 3a02bc2b2f6cab68c4dc1f8bba5869bb48db1f9b..1d5018ca45d346c76aae1d4f4ba19ea76416df04 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetryService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetryService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { extractPoetryNode } from "wax-prosemirror-schema";
 import ExtractPoetry from "./ExtractPoetry";
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProseService.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProseService.js
index a6c8739d014677dcbfb68f66fa16beac0c4569fb..f1bbf427f565d2f432ade0443f91e3f6c32d4acb 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProseService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProseService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { extractProseNode } from "wax-prosemirror-schema";
 import ExtractProse from "./ExtractProse";
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinuedService.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinuedService.js
index 73236e2ddb1ba2a7981a682215c32ec10a29cfb9..f99837896f1639c9e24c98914761b376eada1576 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinuedService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinuedService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { paragraphContNode } from "wax-prosemirror-schema";
 import ParagraphContinued from "./ParagraphContinued";
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/ParagraphService.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/ParagraphService.js
index 25e572b674253865eb1523304c203af250995eac..fa2ffdbcca12d12b74394b6cda7b1bc609fb8f89 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/ParagraphService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/ParagraphService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Paragraph from "./Paragraph";
 
 class ParagraphService extends Service {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNoteService.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNoteService.js
index 1b31d838ca2ed03f0411d74a0fd1fed449c05177..659262ab90c0eedbf19b59ce571775b2a11d0669 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNoteService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNoteService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import { sourceNoteNode } from "wax-prosemirror-schema";
 import SourceNote from "./SourceNote";
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js b/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
index 73c7a481922177be0c3a6030e55ae0b3e4997630..756956f3c3a69f7576d5b1e89f7dd3fca42fc855 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import TextServices from "./index";
 
 class TextBlockLevelService extends Service {
diff --git a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
index 9ff014eda601a874e221f7033d0c77dec70a1279..0cb3937abb94072aca55ada25b919c8dce1b30e3 100644
--- a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
+++ b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import { trackChangesMarks, trackChangesNodes } from "wax-prosemirror-schema";
 
 class TrackChangeService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/AnnotationToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/AnnotationToolGroupService.js
index 0e7e5b0fc276f36b4057176ce7d45e78b259aaf7..4a3f4e8d2a820ada54494bde86ece60f274a0e7c 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/AnnotationToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/AnnotationToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Annotations from "./Annotations";
 
 class AnnotationToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js
index 4d9899ecf3116404533a45100644c11abe8b0cd8..7429579fc00c5cd0f3f045f831b9c3639c3cd21e 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Base from "./Base";
 
 class BaseToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
index def00483557df04d5452a3f5699d29643a7360d4..8ffc1852e311c5ced5d0ae2003e9530ac0344f90 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Display from "./Display";
 
 class DisplayToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
index 4711a34d55b1772433f08daf75b3dc51ae0e2e2a..cd249031ac3187899b133dcbf3013786f19e3f07 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Images from "./Images";
 
 class ImageToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
index 960726baab934fbb54814d91c93ef354ec73c31a..815d423e2c4c99ebbaf4b221667e03350fb98bd2 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Lists from "./Lists";
 
 class ListToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
index f1992f8184cd096267880434165b44c33bc92141..15d469325ab6ef6708dfe39f6e51675fd31e58fc 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Notes from "./Notes";
 
 class NoteToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
index 0f7483050cff63ff4fd9328988a4853f7536b4f7..3c0b40a5275d74806cf7b27e440a70b4572202a6 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Tables from "./Tables";
 
 class TableToolGroupService extends Service {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
index 2f1f059321fa81dc4490f6ee252a8f984ce8d7b6..7b074f52fb8e41f12e5b7dadd29a02abc1316aa0 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from "wax-prosemirror-core";
+import Service from "../../Service";
 import Text from "./Text";
 
 class TextToolGroupService extends Service {