diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 0e2b3c304de0cb60033dca84a73395c0f9aeaece..b46d15e5b24e0efb29f49b1f57d12d201f2d362a 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -8,4 +8,14 @@ export { default as Middleware } from './src/utilities/lib/Middleware';
 export { default as ToolGroup } from './src/utilities/lib/ToolGroup';
 export { default as Tools } from './src/utilities/lib/Tools';
 
+/* Base services */
+export { default as LayoutService } from './src/config/defaultServices/LayoutService/LayoutService';
+export { default as PortalService } from './src/config/defaultServices/PortalService/PortalService';
+export { default as MenuService } from './src/config/defaultServices/MenuService/MenuService';
+export { default as OverlayService } from './src/config/defaultServices/OverlayService/OverlayService';
+export { default as RulesService } from './src/config/defaultServices/RulesService/RulesService';
+export { default as SchemaService } from './src/config/defaultServices/SchemaService/SchemaService';
+export { default as ShortCutsService } from './src/config/defaultServices/ShortCutsService/ShortCutsService';
+export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
+
 export { default as Wax } from './src/Wax';
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index 33d89fade7127e2d947b0524e4f32bfbc06b0997..ef7f4f8a3a5ca5e6dffe6111ff04026cfe808090 100644
--- a/wax-prosemirror-core/src/Application.js
+++ b/wax-prosemirror-core/src/Application.js
@@ -1,5 +1,5 @@
 import { Container } from 'inversify';
-import 'reflect-metadata';
+// import 'reflect-metadata';
 import deepmerge from 'deepmerge';
 import Config from './config/Config';
 import defaultConfig from './config/defaultConfig';
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index 9871d85c86fd400eaa553af519e8b35b1efb9624..8b5f98f721ab61fd2f13294ee4d803b9a4c87463 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -1,13 +1,10 @@
-/* eslint-disable import/no-extraneous-dependencies */
-import {
-  SchemaService,
-  MenuService,
-  RulesService,
-  ShortCutsService,
-  LayoutService,
-  OverlayService,
-  PortalService,
-} from 'wax-prosemirror-services';
+import SchemaService from './defaultServices/SchemaService/SchemaService';
+import RulesService from './defaultServices/RulesService/RulesService';
+import ShortCutsService from './defaultServices/ShortCutsService/ShortCutsService';
+import LayoutService from './defaultServices/LayoutService/LayoutService';
+import PortalService from './defaultServices/PortalService/PortalService';
+import MenuService from './defaultServices/MenuService/MenuService';
+import OverlayService from './defaultServices/OverlayService/OverlayService';
 
 export default () => ({
   services: [
diff --git a/wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/DefaultLayout/DefaultLayout.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/DefaultLayout/DefaultLayout.js
diff --git a/wax-prosemirror-services/src/LayoutService/Layout.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/Layout.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/Layout.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/Layout.js
diff --git a/wax-prosemirror-services/src/LayoutService/LayoutService.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/LayoutService.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
diff --git a/wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/LayoutFactory.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/components/LayoutFactory.js
diff --git a/wax-prosemirror-services/src/LayoutService/components/componentPlugin.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/components/componentPlugin.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
diff --git a/wax-prosemirror-services/src/MenuService/Menu.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/Menu.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuCollection.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuCollection.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuCollection.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuCollection.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuService.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuService.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuWrapper.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuWrapper.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuWrapper.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuWrapper.js
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayComponent.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/OverlayComponent.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayService.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/OverlayService.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
diff --git a/wax-prosemirror-services/src/OverlayService/usePosition.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/usePosition.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/usePosition.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/usePosition.js
diff --git a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/AbstractNodeView.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/AbstractNodeView.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/AbstractNodeView.js
diff --git a/wax-prosemirror-services/src/PortalService/PortalService.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/PortalService.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
diff --git a/wax-prosemirror-services/src/PortalService/Portals.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/Portals.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/Portals.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/Portals.js
diff --git a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/components/PortalComponent.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/components/PortalComponent.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/components/PortalComponent.js
diff --git a/wax-prosemirror-services/src/PortalService/portalPlugin.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/portalPlugin.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/portalPlugin.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/portalPlugin.js
diff --git a/wax-prosemirror-services/src/RulesService/Rules.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/Rules.js
similarity index 100%
rename from wax-prosemirror-services/src/RulesService/Rules.js
rename to wax-prosemirror-core/src/config/defaultServices/RulesService/Rules.js
diff --git a/wax-prosemirror-services/src/RulesService/RulesService.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
similarity index 100%
rename from wax-prosemirror-services/src/RulesService/RulesService.js
rename to wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
diff --git a/wax-prosemirror-services/src/SchemaService/Mark.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Mark.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Mark.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Mark.js
diff --git a/wax-prosemirror-services/src/SchemaService/Node.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Node.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Node.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Node.js
diff --git a/wax-prosemirror-services/src/SchemaService/ParseRule.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/ParseRule.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/ParseRule.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/ParseRule.js
diff --git a/wax-prosemirror-services/src/SchemaService/Schema.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Schema.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Schema.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Schema.js
diff --git a/wax-prosemirror-services/src/SchemaService/SchemaService.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/SchemaService.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
similarity index 100%
rename from wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
rename to wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
similarity index 100%
rename from wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
rename to wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
diff --git a/wax-prosemirror-core/src/utilities/lib/Tools.js b/wax-prosemirror-core/src/utilities/lib/Tools.js
index 00718ebaaacd9e588a9966d19ed95ce339548735..f6a92e4883432a844e3380e150f7f41d5611eabf 100644
--- a/wax-prosemirror-core/src/utilities/lib/Tools.js
+++ b/wax-prosemirror-core/src/utilities/lib/Tools.js
@@ -4,7 +4,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { isEmpty } from 'lodash';
 import { injectable, inject } from 'inversify';
 import { Button } from 'wax-prosemirror-components';
-import 'reflect-metadata';
 
 @injectable()
 class Tools {
diff --git a/wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js b/wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
similarity index 92%
rename from wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js
rename to wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
index e776a218e80854c0c15243c34c42f1a7e9b28c87..1c38f0507cedc199196717d12e0b767972133503 100644
--- a/wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js
+++ b/wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
@@ -1,4 +1,4 @@
-import AbstractNodeView from '../../PortalService/AbstractNodeView';
+import AbstractNodeView from '../../../config/defaultServices/PortalService/AbstractNodeView';
 
 export default class QuestionsNodeView extends AbstractNodeView {
   constructor(
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 80610c3e9c37e2e14f8d4af7e501d48b9f925db5..a2121f85a32b0a00cedb01bdfaf32e7c91825da0 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -1,13 +1,3 @@
-/* Base Services move to core */
-export { default as LayoutService } from './src/LayoutService/LayoutService';
-export { default as PortalService } from './src/PortalService/PortalService';
-export { default as MenuService } from './src/MenuService/MenuService';
-export { default as OverlayService } from './src/OverlayService/OverlayService';
-export { default as RulesService } from './src/RulesService/RulesService';
-export { default as SchemaService } from './src/SchemaService/SchemaService';
-export { default as ShortCutsService } from './src/ShortCutsService/ShortCutsService';
-export { default as AbstractNodeView } from './src/PortalService/AbstractNodeView';
-
 /*
 All Elements services
 */
diff --git a/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js b/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
index 0b56c83e776cc32ee8f341e265fd0797d1a2f435..d2ee9ec6dce3accf2dc9da51a8c306a61a738692 100644
--- a/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
+++ b/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class EssayAnswerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js b/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
index dd941003db193a23cbcfba30b4a171ff71b209c3..d76164984b77fd75cec55c5a9921a538311220c0 100644
--- a/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
+++ b/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class EssayQuestionNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
index b973b767c8efc80c925cb2d1c091f8f63bdfbfa0..23e37bbb02a8e38b3e1a5e83caffcacaf245aa20 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class FillTheGapContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
index c8b2081b459a481aa54f4e861e94db1f2fdef043..2b45108120d1cb126fef9ae104a8e41bfcaea9b6 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class FillTheGapNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js b/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
index 387c6ccc37b88a493197affc95d3f51e056a3ab5..1eb1037359be1e64c88bbacb89e8a6f8e99f40ed 100644
--- a/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
+++ b/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MatchingContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js b/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
index f5a9656cbef57d6f32dc2a190cf89c46c5735a11..9d5d78d1d4afcad7cd453fc37870ffc42f0bdcd7 100644
--- a/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
+++ b/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MatchingOptionNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
index f22b73d48ee926ec65e48aaadc0b167933644fd4..e914da795cc19e327328316c3990a2c6181326a1 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleChoiceContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index e72d3e88be41c1a32560ca13376c9fc085f0a826..78a157c9c8e2d10c4f229f9d7f020c7e2484347d 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleChoiceNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
index 2d79fe7426fdcfaad1d050d93985013f451d3cb7..c04f4e6160e4d0a4dd99d3602ec99f77093570bb 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleChoiceSingleCorrectContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
index e650e3a32c716e8a10e3bdaf92a4faa57daba9c0..fc7b76f69f23642a21f29add5ed8f9262a3d89f9 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleChoiceSingleCorrectNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
index 32b24344c1f8ae3025af8cd6366d389ecec4016d..4a69d56140712ffd4fb20c66d869231f932e7c90 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class QuestionMultipleSingleNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
index 1e122f446036de8e76fe16da92facd442280d536..71d2ec94ab63d397fc943621bd23b1871de9798d 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class QuestionNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
index 11fa2e31c52373e06b7af51fa5ea6e8f322fa8f3..b5f13a61fe2962470687a80a2e8590703434bd92 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class QuestionTrueFalseNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
index 87e1f2816258c748f248ea11813a199ddeb34896..6e01a409bad651715cf1170cae465692d118fe61 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class TrueFalseContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
index 88b51be2adf8a974c16b5bbc541bb4a4dc38c69d..99c31163c2a97f8a3db869f343fecf8640a9d0b9 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class TrueFalseNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
index d7d1919b3e9062cc1fa8a73fed3bf17e5d39369b..9625f18c56431b93906038ffc300f7ef3f77a031 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class QuestionTrueFalseSingleNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
index 0d8e5e3de984de955d31765df6ef5c40a304dbe9..4a815e5b39644bd4afe1ad973345947ad8465c7c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class TrueFalseSingleCorrectContainerNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
index 31ec0d59e54132d54b19f50ec41794fa484cfc65..23e69427fd92cd7c5fe2b79d3a21d3bd89eb6ca7 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class TrueFalseSingleCorrectNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
index aa8ac0a39f74b1bca0df1dc9bb014caba13a8b78..7b1d397d6c586e40ccc013c4d11c000514f06873 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleDropDownNodeView extends QuestionsNodeView {
   constructor(
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
index ed50a9c56312c7057bf3802ae9a28d74617276f4..fe43906a40ab6a4841cbc03c275aa607e8d873ad 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
 
 export default class MultipleDropDownContainerNodeView extends QuestionsNodeView {
   constructor(