diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index a2fc67c75f2c4c482b87ff66aa36f72b6ecde5d9..38ed4384f0b631679ab1a75d993a268f71c5cec4 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -1,6 +1,6 @@
-export { default as Wax } from "./src/Wax";
 export { default as Service } from "./src/services/Service";
-export { default as WaxContext } from "./src/ioc-react";
+export { default as test } 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/services/Service.js b/wax-prosemirror-core/src/services/Service.js
index 29454ebc80e71028beee7c2ba57548740b5939ec..1dc9d232110d14eb34d9e08bc5ee3c37058f4f3f 100644
--- a/wax-prosemirror-core/src/services/Service.js
+++ b/wax-prosemirror-core/src/services/Service.js
@@ -1,4 +1,4 @@
-export default class Service {
+class Service {
   app = {};
   setApp(app) {
     this.app = app;
@@ -16,3 +16,5 @@ export default class Service {
     return this.app.getSchema();
   }
 }
+
+export default Service;
diff --git a/wax-prosemirror-services/src/BaseService/BaseService.js b/wax-prosemirror-services/src/BaseService/BaseService.js
index 79fe0ce31811c90119b3865c5171e7af249e4c31..11f07fb3fb998196e0d2054a3011e814b88c2baf 100644
--- a/wax-prosemirror-services/src/BaseService/BaseService.js
+++ b/wax-prosemirror-services/src/BaseService/BaseService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import BaseServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class BaseService extends Service {
   dependencies = BaseServices;
diff --git a/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js b/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js
index fcd403e46d542a94eb845a84c8f842d3b41d0ee3..80b1933f23109e214edbe46f81a7dd55ab725260 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 6ed2c5bef669cd195ca3f9fa1f02f3846278b649..94956e3ecc5579d3fceddb70b2414a70a0f9b4b3 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 5a52e780a1104c6f9db13473a2f17864157b9b14..a47dabf1b2a635fd0e387343626e46b3943a1a47 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 e9256725ace8fd070727fda5ae72a2fc26cff245..97b94ea493e0597210e7f8845be1196f7d9db54b 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 c7a259badac013bdc51f3573abfe954fe7c91c7a..bf378858cc803f895073adb14d8b74ec1608b6e9 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 334fff759345c21b580cd955cb3d500bdf38446e..86a15d76ce4d03b888c1035daecc3ae60ed232bb 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/DisplayBlockLevelService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import DisplayServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class DisplayBlockLevelService extends Service {
   // register() {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js
index 8827f9725db1216bcd328f600eb65ae0207a22c5..921999613ed4b256826b64dabdb41aa59d6f1529 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 e399616db725e33e06bcea4ddfb2010ba882c0c6..a848a780acbb3b91d6a0173ceb480d5ee6723d97 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 4a2e6cc71a3cc8576783a17b4a73818110fcd3de..290c8f1015b1768cd59771407ed230d47b8a17f2 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 aa825e2ed4a0105d37e8f4aa907a28e85bcf3912..681001c43a581fb7426efad0d8247ede05fe687f 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 05221017b16087b42854ac654e5d10bdcc42976d..bf3dea5d3bade6279f3ff9574fff012c88fe5850 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 efa983a1d4eb6ee7c2cbba67086d018cf4cfa882..a4c06b16334d6700aeb056e04d07588d1b97bea0 100644
--- a/wax-prosemirror-services/src/ImageService/ImageService.js
+++ b/wax-prosemirror-services/src/ImageService/ImageService.js
@@ -1,6 +1,6 @@
+import { Service } from "wax-prosemirror-core";
 import Image from "./Image";
 import { imageNode } from "wax-prosemirror-schema";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 export default class ImageService extends Service {
   name = "ImageService";
diff --git a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
index c3e5baa8509cf643f6a23559618b8b93d94a360a..191adc2a52de5deb7ec598a71b2cad1bb82e6787 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { toggleMark } from "prosemirror-commands";
-import Service from "wax-prosemirror-core/src/services/Service";
 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 846d341b64690650a538ab4eccfcbe821bf97e6d..57f542c4299f71eb3381760c770e2a8238e94a73 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { toggleMark } from "prosemirror-commands";
-import Service from "wax-prosemirror-core/src/services/Service";
 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 7dde0d0c21e3dbb75b6c841ae09a4a79e5f93e92..051c48d25cf8db267dd08a27c3d81b535b70f06c 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import InlineServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class InlineAnnotationsService extends Service {
   dependencies = InlineServices;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
index 6fcb6918e02b9079eafc980d62c7efa4536877f7..45bfdba51538d65cd3468252fb1e7b53ae03299e 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 99cbfbe7f4cc81f2fce228734baba3b9995e5801..5d26c46d39d9b178a0b2ca9e841220947cec82fe 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 b77b74c38281d37ddbd6bf4ac050f0c5554871b9..ab4d8475470b2bdeb2b2456545ff479027c1ae21 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { toggleMark } from "prosemirror-commands";
-import Service from "wax-prosemirror-core/src/services/Service";
 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 c7cabf7f80159d3be6534a85f4bce0a91fefa0fa..fefec688781e32dcfa690f2353d055f6ab91f647 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 6abb4c0d1003383babeffe84ebd52bbed78f6659..c3e3659bce7ae01a826032c9b6b237ebfb2682d5 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 959f7406f72dd57b05227bc6ff2cdfb2bad7026f..d5874c94af2d540a11fd4bb4f564ec951bcb9d6a 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { toggleMark } from "prosemirror-commands";
-import Service from "wax-prosemirror-core/src/services/Service";
 import { underlineMark } from "wax-prosemirror-schema";
 import Underline from "./Underline";
 
diff --git a/wax-prosemirror-services/src/LinkService/LinkService.js b/wax-prosemirror-services/src/LinkService/LinkService.js
index 61d80965eea6f71dcc9d3de5328874705397c934..31624c641e30b96d64bbdde4312c20ed4f2ae414 100644
--- a/wax-prosemirror-services/src/LinkService/LinkService.js
+++ b/wax-prosemirror-services/src/LinkService/LinkService.js
@@ -1,5 +1,4 @@
-import Service from "wax-prosemirror-core/src/services/Service";
-
+import { Service } from "wax-prosemirror-core";
 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 7c582cdeb58ef470bbab3803eb8a99d6caa87a76..85e0d1dacdca3709b0d01563b4db5918a4d1cdb3 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
@@ -1,6 +1,6 @@
+import { Service } from "wax-prosemirror-core";
 import { wrapInList } from "prosemirror-schema-list";
 import { bulletListNode } from "wax-prosemirror-schema";
-import Service from "wax-prosemirror-core/src/services/Service";
 import BulletList from "./BulletList";
 
 class BulletListService extends Service {
diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
index 04912d389038edfb176ef6a529567b299764f53c..36e3b1f4810e524a0cbe503ecf8eaa8836a1bb89 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 285957d1415fb42c0b54e023529df3a0234d6b94..f594a61c1ec16f68d518f17bf70d3aeda92f4b19 100644
--- a/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
+++ b/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { liftListItem, sinkListItem } from "prosemirror-schema-list";
-import Service from "wax-prosemirror-core/src/services/Service";
 import Lift from "./Lift";
 
 class LiftService extends Service {
diff --git a/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js b/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
index 1de99c1bcfb9cac28f0d8d44f4042e63958f162d..abccb39399b1cc316912f0bbfe2a4f52745cbad1 100644
--- a/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
+++ b/wax-prosemirror-services/src/ListsService/ListItemService/ListItemService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { listItemNode } from "wax-prosemirror-schema";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class ListItemService extends Service {
   boot() {}
diff --git a/wax-prosemirror-services/src/ListsService/ListsService.js b/wax-prosemirror-services/src/ListsService/ListsService.js
index b9fff5437466c0377ef98d0c8865b68884b3efe8..e8ee63462c07006556857ab79a9673ff8b158a6e 100644
--- a/wax-prosemirror-services/src/ListsService/ListsService.js
+++ b/wax-prosemirror-services/src/ListsService/ListsService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import ListsServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class ListsService extends Service {
   dependencies = ListsServices;
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
index 2620c5f3c301189c9085057898361494712bcc18..977546208524f18afab634701867b8cded89ae41 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
@@ -1,6 +1,6 @@
+import { Service } from "wax-prosemirror-core";
 import { wrapInList } from "prosemirror-schema-list";
 import { orderedListNode } from "wax-prosemirror-schema";
-import Service from "wax-prosemirror-core/src/services/Service";
 import OrderedList from "./OrderedList";
 
 class OrderedListService extends Service {
diff --git a/wax-prosemirror-services/src/MenuService/MenuService.js b/wax-prosemirror-services/src/MenuService/MenuService.js
index 9c22785454acb497ad9ed31e9c86017a7810c8f9..2497e71c034b94c6db010e244693e5d998e35a50 100644
--- a/wax-prosemirror-services/src/MenuService/MenuService.js
+++ b/wax-prosemirror-services/src/MenuService/MenuService.js
@@ -1,7 +1,7 @@
 import { isPlainObject, isFunction } from "lodash";
+import { Service } from "wax-prosemirror-core";
 import Menu from "./Menu";
 import MenuCollection from "./MenuCollection";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class MenuService extends Service {
   name = "MenuService";
diff --git a/wax-prosemirror-services/src/ModalService/ModalService.js b/wax-prosemirror-services/src/ModalService/ModalService.js
index b0251439311809f117e70e25de6ecf9448e0a4d5..ef75f9153d5e2b2e65873b0b2934bf25ee3c8287 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 81b3e66e6ee88550e6001d7473e00dd97c28d5b0..09b0125f7f6abb7b2890ad2aa68ee10763dbc9a1 100644
--- a/wax-prosemirror-services/src/NoteService/NoteService.js
+++ b/wax-prosemirror-services/src/NoteService/NoteService.js
@@ -1,8 +1,8 @@
-import Note from "./Note";
-import Service from "wax-prosemirror-core/src/services/Service";
-import NoteComponent from "./NoteComponent";
+import { Service } from "wax-prosemirror-core";
 import { footNoteNode } from "wax-prosemirror-schema";
 import { CommentBubbleComponent } from "wax-prosemirror-components";
+import Note from "./Note";
+import NoteComponent from "./NoteComponent";
 
 class NoteService extends Service {
   name = "NoteService";
diff --git a/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js b/wax-prosemirror-services/src/PlaceholderService/PlaceholderService.js
index ad017bcec66e7274a2c951aaa302ebfbc9edc3c7..9b994ec2712c7db25ab3ccba6a6d992c7e366a36 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 a298a98582c97110c9c17227269f509835d55a40..6ea9380eb536618a4610572f1fa889bc4303402b 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 import Rules from "./Rules";
 
 export default class RulesService extends Service {
@@ -17,9 +17,7 @@ export default class RulesService extends Service {
     this.container
       .bind("Rules")
       .toDynamicValue(() => {
-        const {
-          schema: { schema }
-        } = this.app;
+        const { schema: { schema } } = this.app;
 
         return new Rules(PmPlugins, schema);
       })
diff --git a/wax-prosemirror-services/src/SchemaService/SchemaService.js b/wax-prosemirror-services/src/SchemaService/SchemaService.js
index e530c3eb488cb64090e70e8bb29460aeae91dea5..d9cfc8b6d5c35193daddca6fbe00c7781395beb2 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 import Schema from "./Schema";
 import Node from "./Node";
 import Mark from "./Mark";
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js b/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
index 17a42b805f91de993b4f641caa5811ac35d32773..d17b988eeb08e9533c0cf50e4f3e11fa99f702d6 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 969a3bad14c9259f514b3344d5575f76b413b7de..8e0b1ccf6914d345e591a83c521b263bc713c400 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 c9900f1d907e31a52cc4a740e8def4c3e874ff85..10baaab523f8918cd7c9959c04f26dba7c79b3a0 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import { tableNodes, goToNextCell } from "prosemirror-tables";
-import Service from "wax-prosemirror-core/src/services/Service";
 import Table from "./Table";
 
 class InsertTableService extends Service {
diff --git a/wax-prosemirror-services/src/TablesService/TablesService.js b/wax-prosemirror-services/src/TablesService/TablesService.js
index dbc2447c31836f2b1feb0e7e7adf8281525cf01e..69910e5b2694341af39257df4af3a3bf6d730cfa 100644
--- a/wax-prosemirror-services/src/TablesService/TablesService.js
+++ b/wax-prosemirror-services/src/TablesService/TablesService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import TablesServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class TablesService extends Service {
   dependencies = TablesServices;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js
index 5539ca3b988bc810d809bffce025d45fab7d25b4..c75b9441bc457e5c2b72c4207f9b4f6f7fdbd6e9 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 9b0a043a08c75a58aaf1d3540b0b146ced763768..3a02bc2b2f6cab68c4dc1f8bba5869bb48db1f9b 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 74933be551e9260694c2518de6d25ad335194e03..a6c8739d014677dcbfb68f66fa16beac0c4569fb 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 dbb93a649076d611dfb88219f8544fdd20b9697c..73236e2ddb1ba2a7981a682215c32ec10a29cfb9 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 b02a73f210db858dc2ada728c00099e5f7d53ed2..25e572b674253865eb1523304c203af250995eac 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 f57ac2f927fcf006dc7cc97d61b3441728814413..1b31d838ca2ed03f0411d74a0fd1fed449c05177 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 1836df771fb0fa198614b9fd08a3e13f2cb283d6..73c7a481922177be0c3a6030e55ae0b3e4997630 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import TextServices from "./index";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class TextBlockLevelService extends Service {
   dependencies = TextServices;
diff --git a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
index b2bdc49c462839f88c525b0522e752c7677d5765..9ff014eda601a874e221f7033d0c77dec70a1279 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 2d335bed09addf988cf8cb09a3e994644ca926ee..0e7e5b0fc276f36b4057176ce7d45e78b259aaf7 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/src/services/Service";
+import { Service } from "wax-prosemirror-core";
 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 90b532f0f93e476bbf0e377efa0e67777bff36ed..4d9899ecf3116404533a45100644c11abe8b0cd8 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Base from "./Base";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class BaseToolGroupService extends Service {
   name = "BaseToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
index a2a4c84fdd282bf4524272955a1337dcf7a7cb8c..def00483557df04d5452a3f5699d29643a7360d4 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Display from "./Display";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class DisplayToolGroupService extends Service {
   name = "DisplayToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
index 4e5c2f132466159638c5c031642511b884f96f3c..4711a34d55b1772433f08daf75b3dc51ae0e2e2a 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Images from "./Images";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class ImageToolGroupService extends Service {
   name = "ImageToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
index 311f02da644b59a37fc7310dc488dbc2be870851..960726baab934fbb54814d91c93ef354ec73c31a 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/ListToolGroupService/ListToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Lists from "./Lists";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class ListToolGroupService extends Service {
   name = "ListToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
index 99322bdd00424f26e300dceedc1d1c04ccae9353..f1992f8184cd096267880434165b44c33bc92141 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Notes from "./Notes";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class NoteToolGroupService extends Service {
   name = "NoteToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
index 10c19d7df52183acb6f200021d6b7e65c5199eb7..0f7483050cff63ff4fd9328988a4853f7536b4f7 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Tables from "./Tables";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class TableToolGroupService extends Service {
   name = "TableToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
index 80f34a2fc2f9660e8bbf32ab30a85b0f2118f18d..2f1f059321fa81dc4490f6ee252a8f984ce8d7b6 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TextToolGroupService/TextToolGroupService.js
@@ -1,5 +1,5 @@
+import { Service } from "wax-prosemirror-core";
 import Text from "./Text";
-import Service from "wax-prosemirror-core/src/services/Service";
 
 class TextToolGroupService extends Service {
   name = "TextToolGroupService";