diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
new file mode 100644
index 0000000000000000000000000000000000000000..12ed7228e6d81da832f0b4c0141c757736e1f670
--- /dev/null
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import Table from "./Table";
+
+class EditTableService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("TableDropDownOptions").to(TableDropDownOptions);
+  }
+}
+
+export default EditTableService;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/TableDropDownOptions.js b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/TableDropDownOptions.js
rename to wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
new file mode 100644
index 0000000000000000000000000000000000000000..1644a00da4584a5302ebd927ada0340c302d7935
--- /dev/null
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import Table from "./Table";
+
+class InsertTableService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("Table").to(Table);
+  }
+}
+
+export default InsertTableService;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/Table.js b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
similarity index 80%
rename from wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/Table.js
rename to wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
index 5de1b8c841058d2b89370016d2477f432e1b1226..238c9084ecdb3ffc8cc4003598401d83db04685f 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/Table.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
@@ -1,5 +1,5 @@
-import Tools from "../../../lib/Tools";
-import { createTable, canInsert } from "../../../lib/Utils";
+import Tools from "../../lib/Tools";
+import { createTable, canInsert } from "../../lib/Utils";
 import { injectable } from "inversify";
 import { icons } from "wax-prosemirror-components";
 
diff --git a/wax-prosemirror-services/src/TablesService/TablesService.js b/wax-prosemirror-services/src/TablesService/TablesService.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d2805a7a241eb3750769c97bb5ef0f0286b7d0f
--- /dev/null
+++ b/wax-prosemirror-services/src/TablesService/TablesService.js
@@ -0,0 +1,10 @@
+import TablesServices from "./index";
+import Service from "wax-prosemirror-core/src/services/Service";
+
+class TablesService extends Service {
+  register() {
+    this.config.pushToArray("services", TablesServices);
+  }
+}
+
+export default TablesService;
diff --git a/wax-prosemirror-services/src/TablesService/index.js b/wax-prosemirror-services/src/TablesService/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
index 31702bd78423c2551b6c8159be23070e21d9287a..cf8b596567139790a2b8199b807476231d498c4d 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
@@ -15,9 +15,7 @@ class Annotations extends ToolGroup {
     @inject("Superscript") superscript,
     @inject("Underline") underline,
     @inject("Blockquote") blockquote,
-    @inject("Image") image,
-    @inject("Table") table,
-    @inject("TableDropDownOptions") tableDropDownOptions
+    @inject("Image") image
   ) {
     super();
     this.tools = [
@@ -31,9 +29,7 @@ class Annotations extends ToolGroup {
       superscript,
       underline,
       blockquote,
-      tableDropDownOptions,
-      image,
-      table
+      image
     ];
   }
 
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/index.js b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/index.js
index 02d863b5bbfedd5ac8280637c3036a2dcbfafd66..aa1b1d707be8bc377b6538cc20cbbbbaa5480bcf 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/index.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/tools/index.js
@@ -1,3 +1 @@
 export { default as Blockquote } from "./Blockquote";
-export { default as Table } from "./Table";
-export { default as TableDropDownOptions } from "./TableDropDownOptions";