diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index cf386e1c9f5d29ac74424d372e082c02e3cb032b..88a5fafa451d390ae3154ed2b88aa7ae3626fbc9 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -10,12 +10,7 @@ export default {
   MenuService: [
     {
       templateArea: "topBar",
-      toolGroups: [
-        "Annotations",
-        "Lists",
-        "Tables",
-        { name: "RedoUndo", exclude: ["Redo"] }
-      ]
+      toolGroups: ["Annotations", "Lists", "Tables"]
     },
     {
       templateArea: "leftSideBar",
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index b37c05636ae79195bce3d7a3452a8148f214d61f..e86cb597dc72025a80d3791fa2488c414631e209 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -4,7 +4,6 @@ import {
   ImageService,
   MenuService,
   SchemaService,
-  RedoUndoService,
   PlaceholderService,
   RulesService,
   ShortCutsService,
@@ -24,7 +23,6 @@ export default {
     new ShortCutsService(),
     new LayoutService(),
     new MenuService(),
-    new RedoUndoService(),
     new AnnotationToolGroupService(),
     new ListToolGroupService(),
     new TextStyleService(),
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 59fda382873797ddaa7e763fea7029e99be641c9..107eca983af1a8ef68bd7712a01d49542db250ab 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -1,9 +1,6 @@
 export { default as MenuService } from "./src/MenuService/MenuService";
 export { default as LinkService } from "./src/LinkService/LinkService";
 
-export {
-  default as RedoUndoService
-} from "./src/RedoUndoService/RedoUndoService";
 export {
   default as TextStyleService
 } from "./src/TextStyleService/TextStyleService";
diff --git a/wax-prosemirror-services/src/BaseService/BaseService.js b/wax-prosemirror-services/src/BaseService/BaseService.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5f327077e53da733d0b27e1c0a033afbcecfa9c
--- /dev/null
+++ b/wax-prosemirror-services/src/BaseService/BaseService.js
@@ -0,0 +1,10 @@
+import BaseServices from "./index";
+import Service from "wax-prosemirror-core/src/services/Service";
+
+class BaseService extends Service {
+  register() {
+    this.config.pushToArray("services", BaseServices);
+  }
+}
+
+export default BaseService;
diff --git a/wax-prosemirror-services/src/RedoUndoService/Redo.js b/wax-prosemirror-services/src/BaseService/RedoService/Redo.js
similarity index 100%
rename from wax-prosemirror-services/src/RedoUndoService/Redo.js
rename to wax-prosemirror-services/src/BaseService/RedoService/Redo.js
diff --git a/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js b/wax-prosemirror-services/src/BaseService/RedoService/RedoService.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js b/wax-prosemirror-services/src/BaseService/SaveService/SaveService.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wax-prosemirror-services/src/RedoUndoService/Undo.js b/wax-prosemirror-services/src/BaseService/UndoService/Undo.js
similarity index 100%
rename from wax-prosemirror-services/src/RedoUndoService/Undo.js
rename to wax-prosemirror-services/src/BaseService/UndoService/Undo.js
diff --git a/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js b/wax-prosemirror-services/src/BaseService/UndoService/UndoService.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wax-prosemirror-services/src/BaseService/index.js b/wax-prosemirror-services/src/BaseService/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wax-prosemirror-services/src/RedoUndoService/RedoUndo.js b/wax-prosemirror-services/src/RedoUndoService/RedoUndo.js
deleted file mode 100644
index da7f66bfd1a11258d2e439f05cf84fc409f270b2..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/RedoUndoService/RedoUndo.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { injectable, inject } from "inversify";
-import ToolGroup from "../lib/ToolGroup";
-
-@injectable()
-export default class RedoUndo extends ToolGroup {
-  tools = [];
-  constructor(@inject("Redo") redo, @inject("Undo") undo) {
-    super();
-    this.tools = [redo, undo];
-  }
-
-  renderTools(view) {
-    const tools = [];
-    this.tools.forEach(tool => {
-      tools.push(tool.renderTool(view));
-    });
-    return tools;
-  }
-}
diff --git a/wax-prosemirror-services/src/RedoUndoService/RedoUndoService.js b/wax-prosemirror-services/src/RedoUndoService/RedoUndoService.js
deleted file mode 100644
index 477b333921bb424a9f2ea0a5ef1d1595a4bee2d7..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/RedoUndoService/RedoUndoService.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import RedoUndo from "./RedoUndo";
-import Service from "wax-prosemirror-core/src/services/Service";
-import Redo from "./Redo";
-import Undo from "./Undo";
-
-export default class RedoService extends Service {
-  name = "RedoService";
-
-  register() {
-    this.container.bind("RedoUndo").to(RedoUndo);
-
-    this.container.bind("Redo").to(Redo);
-    this.container.bind("Undo").to(Undo);
-  }
-}
diff --git a/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/Base.js b/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/Base.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1c3639429c22793f916202c03c42e1f721f84476 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/Base.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/BaseToolGroupService/Base.js
@@ -0,0 +1,21 @@
+import { injectable, inject } from "inversify";
+import ToolGroup from "../../lib/ToolGroup";
+
+@injectable()
+class Base extends ToolGroup {
+  tools = [];
+  constructor() {
+    super();
+    this.tools = [];
+  }
+
+  renderTools(view) {
+    const tools = [];
+    this.tools.forEach(tool => {
+      tools.push(tool.renderTool(view));
+    });
+    return tools;
+  }
+}
+
+export default Base;