diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 292f57b0c09251afcd88de6d3294d19eb64fa043..04ef462dee5f90c3856d93114e6f344e0c47cc5f 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -1,4 +1,10 @@
-/* Cotext & ComponentPlugin */
+/* Editor */
+export { default as Wax } from './src/Wax';
+
+/* Service Class */
+export { default as Service } from './src/Service';
+
+/* Context & ComponentPlugin */
 export { WaxContext, useInjection } from './src/WaxContext';
 export { PortalContext } from './src/PortalContext';
 export { default as ComponentPlugin } from './src/ComponentPlugin';
@@ -13,9 +19,6 @@ 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';
 
-/* Service Class */
-export { default as Service } from './src/Service';
-
 /* Base Services */
 export { default as LayoutService } from './src/config/defaultServices/LayoutService/LayoutService';
 export { default as PortalService } from './src/config/defaultServices/PortalService/PortalService';
@@ -24,7 +27,5 @@ export { default as OverlayService } from './src/config/defaultServices/OverlayS
 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';
 
-/* Editor */
-export { default as Wax } from './src/Wax';
+export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index ef7f4f8a3a5ca5e6dffe6111ff04026cfe808090..33d89fade7127e2d947b0524e4f32bfbc06b0997 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/WaxContext.js b/wax-prosemirror-core/src/WaxContext.js
index 3d1d3da3d61e82569f7e6462a24c7624bc66a3be..d97ec379c28c616b9f6b18945d31ae29ab0c433d 100644
--- a/wax-prosemirror-core/src/WaxContext.js
+++ b/wax-prosemirror-core/src/WaxContext.js
@@ -65,21 +65,3 @@ export const useInjection = identifier => {
     ? { instance: container.get(identifier) }
     : null;
 };
-
-export class Service {
-  setApp(app) {
-    this.app = app;
-  }
-
-  get container() {
-    return this.app.container;
-  }
-
-  get config() {
-    return this.app.config.get(`config.${this.name}`) || this.app.config;
-  }
-
-  get schema() {
-    return this.app.getSchema();
-  }
-}
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 0e064d8ab70d29131e3b8d27c7fa980af42752a9..900ce4f33e54ac85a433ab61a521c84329abc1a3 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -14,7 +14,7 @@ import styled from 'styled-components';
 import applyDevTools from 'prosemirror-dev-tools';
 import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
-import { trackedTransaction } from 'wax-prosemirror-services';
+// import { trackedTransaction } from 'wax-prosemirror-services';
 import { WaxContext } from './WaxContext';
 import { PortalContext } from './PortalContext';
 import ComponentPlugin from './ComponentPlugin';
@@ -130,10 +130,11 @@ const WaxView = forwardRef((props, ref) => {
 
   const dispatchTransaction = transaction => {
     const { TrackChange } = props;
-    const tr =
-      TrackChange && TrackChange.enabled
-        ? trackedTransaction(transaction, view.state, user)
-        : transaction;
+    const tr = transaction;
+    // const tr =
+    //   TrackChange && TrackChange.enabled
+    //     ? trackedTransaction(transaction, view.state, user)
+    //     : transaction;
 
     previousDoc = view.state.doc;
     const state = view.state.apply(tr);
diff --git a/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
index 7d6affbbe980db9b671a9fb12423da057a0e3306..7065dfc3b1bf2fe7eda9fd02db3341a2f769d628 100644
--- a/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Layout from './Layout';
 
 export default class LayoutService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
index f838448cc9126cd0bcf88d10b2cdb2c25dbee3b2..9a51ca6e2de4e9a10458d637d2e4531229166ab0 100644
--- a/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
+++ b/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
@@ -1,6 +1,7 @@
 import React, { useMemo, useContext } from 'react';
 import { injectable } from 'inversify';
-import { WaxContext, ToolGroup } from 'wax-prosemirror-core';
+import { WaxContext } from '../../../WaxContext';
+import ToolGroup from '../../../utilities/lib/ToolGroup';
 import MenuWrapper from './MenuWrapper';
 
 @injectable()
diff --git a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
index 48f93faa4576d93dcdee9a40d37d01bf1b626cf2..aa0c4ac7363bd7c0818d9e8f4a628bdcadd341b6 100644
--- a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { isPlainObject, isFunction } from 'lodash';
 import Menu from './Menu';
 import MenuCollection from './MenuCollection';
diff --git a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
index 02596a84804c993e9017529aed4d24a2ab4b8503..b7e641a03dc144cbfd005783c4acfbd816120f28 100644
--- a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import OverlayComponent from './OverlayComponent';
 
 export default class OverlayService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
index e48c30a76294afd308dbd5031e5b6ed3df9de83f..ec3656830a3a1a8486a6351a3dcaa93699db1475 100644
--- a/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import PortalComponent from './components/PortalComponent';
 import PortalPlugin from './portalPlugin';
 import Portals from './Portals';
diff --git a/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
index 8cb6cfb4006011428a18a9e88ccb9b8214a07f1d..bd0e17260191a6b81044ca8695b83d170d745168 100644
--- a/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Rules from './Rules';
 
 export default class RulesService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
index 2a82bc0eee115101cea78cd3e5b629ec35c02e31..0f2308d08278d266efacbf2dc924cfee5115d39e 100644
--- a/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { each } from 'lodash';
 import Schema from './Schema';
 // import Node from './Node';
diff --git a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
index fc16808b6b3c59338144d0089996f8590caf0f2f..b5c3dcc4943107b04e48b6637613a5078305ba4d 100644
--- a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import ShortCuts from './ShortCuts';
 
 export default class ShortCutsService extends Service {