From 53e6576af14fbf001323b5c9af63ed67d222241e Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 22 Apr 2020 15:56:28 +0300
Subject: [PATCH] fix import Service

---
 wax-prosemirror-core/index.js                               | 4 ++--
 wax-prosemirror-core/src/services/Service.js                | 4 +++-
 wax-prosemirror-services/src/BaseService/BaseService.js     | 2 +-
 .../src/BaseService/RedoService/RedoService.js              | 2 +-
 .../src/BaseService/SaveService/SaveService.js              | 2 +-
 .../src/BaseService/UndoService/UndoService.js              | 2 +-
 .../src/CommentsService/CommentsService.js                  | 2 +-
 .../src/DisplayBlockLevel/AuthorService/AuthorService.js    | 2 +-
 .../src/DisplayBlockLevel/DisplayBlockLevelService.js       | 2 +-
 .../EpigraphPoetryService/EpigraphPoetryService.js          | 2 +-
 .../EpigraphProseService/EpigraphProseService.js            | 2 +-
 .../src/DisplayBlockLevel/HeadingService/HeadingService.js  | 2 +-
 .../DisplayBlockLevel/SubTitleService/SubTitleService.js    | 2 +-
 .../src/DisplayBlockLevel/TitleService/TitleService.js      | 2 +-
 wax-prosemirror-services/src/ImageService/ImageService.js   | 2 +-
 .../src/InlineAnnotations/CodeService/CodeService.js        | 2 +-
 .../InlineAnnotations/EmphasisService/EmphasisService.js    | 2 +-
 .../src/InlineAnnotations/InlineAnnotationsService.js       | 2 +-
 .../InlineAnnotations/SmallCapsService/SmallCapsService.js  | 2 +-
 .../StrikeThroughService/StrikeThroughService.js            | 2 +-
 .../src/InlineAnnotations/StrongService/StrongService.js    | 2 +-
 .../InlineAnnotations/SubscriptService/SubscriptService.js  | 2 +-
 .../SuperscriptService/SuperscriptService.js                | 2 +-
 .../InlineAnnotations/UnderlineService/UnderlineService.js  | 2 +-
 wax-prosemirror-services/src/LinkService/LinkService.js     | 3 +--
 .../src/ListsService/BulletListService/BulletListService.js | 2 +-
 .../src/ListsService/JoinUpService/JoinUpService.js         | 2 +-
 .../src/ListsService/LiftService/LiftService.js             | 2 +-
 .../src/ListsService/ListItemService/ListItemService.js     | 2 +-
 wax-prosemirror-services/src/ListsService/ListsService.js   | 2 +-
 .../ListsService/OrderedListService/OrderedListService.js   | 2 +-
 wax-prosemirror-services/src/MenuService/MenuService.js     | 2 +-
 wax-prosemirror-services/src/ModalService/ModalService.js   | 2 +-
 wax-prosemirror-services/src/NoteService/NoteService.js     | 6 +++---
 .../src/PlaceholderService/PlaceholderService.js            | 2 +-
 wax-prosemirror-services/src/RulesService/RulesService.js   | 6 ++----
 wax-prosemirror-services/src/SchemaService/SchemaService.js | 2 +-
 .../src/ShortCutsService/ShortCutsService.js                | 2 +-
 .../src/TablesService/EditTableService/EditTableService.js  | 2 +-
 .../TablesService/InsertTableService/InsertTableService.js  | 2 +-
 wax-prosemirror-services/src/TablesService/TablesService.js | 2 +-
 .../TextBlockLevel/BlockQuoteService/BlockQuoteService.js   | 2 +-
 .../ExtractPoetryService/ExtractPoetryService.js            | 2 +-
 .../ExtractProseService/ExtractProseService.js              | 2 +-
 .../ParagraphContinuedService/ParagraphContinuedService.js  | 2 +-
 .../src/TextBlockLevel/ParagraphService/ParagraphService.js | 2 +-
 .../TextBlockLevel/SourceNoteService/SourceNoteService.js   | 2 +-
 .../src/TextBlockLevel/TextBlockLevelService.js             | 2 +-
 .../src/TrackChangeService/TrackChangeService.js            | 2 +-
 .../AnnotationToolGroupService.js                           | 2 +-
 .../BaseToolGroupService/BaseToolGroupService.js            | 2 +-
 .../DisplayToolGroupService/DisplayToolGroupService.js      | 2 +-
 .../ImageToolGroupService/ImageToolGroupService.js          | 2 +-
 .../ListToolGroupService/ListToolGroupService.js            | 2 +-
 .../NoteToolGroupService/NoteToolGroupService.js            | 2 +-
 .../TableToolGroupService/TableToolGroupService.js          | 2 +-
 .../TextToolGroupService/TextToolGroupService.js            | 2 +-
 57 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index a2fc67c75..38ed4384f 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 29454ebc8..1dc9d2321 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 79fe0ce31..11f07fb3f 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 fcd403e46..80b1933f2 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 6ed2c5bef..94956e3ec 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 5a52e780a..a47dabf1b 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 e9256725a..97b94ea49 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 c7a259bad..bf378858c 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 334fff759..86a15d76c 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 8827f9725..921999613 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 e399616db..a848a780a 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 4a2e6cc71..290c8f101 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 aa825e2ed..681001c43 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 05221017b..bf3dea5d3 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 efa983a1d..a4c06b163 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 c3e5baa85..191adc2a5 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 846d341b6..57f542c42 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 7dde0d0c2..051c48d25 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 6fcb6918e..45bfdba51 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 99cbfbe7f..5d26c46d3 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 b77b74c38..ab4d84754 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 c7cabf7f8..fefec6887 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 6abb4c0d1..c3e3659bc 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 959f7406f..d5874c94a 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 61d80965e..31624c641 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 7c582cdeb..85e0d1dac 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 04912d389..36e3b1f48 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 285957d14..f594a61c1 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 1de99c1bc..abccb3939 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 b9fff5437..e8ee63462 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 2620c5f3c..977546208 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 9c2278545..2497e71c0 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 b02514393..ef75f9153 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 81b3e66e6..09b0125f7 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 ad017bcec..9b994ec27 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 a298a9858..6ea9380eb 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 e530c3eb4..d9cfc8b6d 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 17a42b805..d17b988ee 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 969a3bad1..8e0b1ccf6 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 c9900f1d9..10baaab52 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 dbc2447c3..69910e5b2 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 5539ca3b9..c75b9441b 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 9b0a043a0..3a02bc2b2 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 74933be55..a6c8739d0 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 dbb93a649..73236e2dd 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 b02a73f21..25e572b67 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 f57ac2f92..1b31d838c 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 1836df771..73c7a4819 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 b2bdc49c4..9ff014eda 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 2d335bed0..0e7e5b0fc 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 90b532f0f..4d9899ecf 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 a2a4c84fd..def004835 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 4e5c2f132..4711a34d5 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 311f02da6..960726baa 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 99322bdd0..f1992f818 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 10c19d7df..0f7483050 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 80f34a2fc..2f1f05932 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";
-- 
GitLab